diff --git a/Wallet/Info.plist b/Wallet/Info.plist index e33b51058a..7e6af0fec1 100644 --- a/Wallet/Info.plist +++ b/Wallet/Info.plist @@ -38,8 +38,12 @@ $(PRODUCT_NAME) CFBundlePackageType APPL + CFBundleShortVersionString + $(PRODUCT_BUNDLE_SHORT_VERSION) CFBundleSignature ???? + CFBundleVersion + ${BUILD_NUMBER} ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen b/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen deleted file mode 100644 index 127fcc96b5..0000000000 --- a/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen +++ /dev/null @@ -1,61 +0,0 @@ -{ - "additionalFilePaths" : [ - "Wallet/BUILD" - ], - "buildTargets" : [ - "//Wallet:Lib", - "//Wallet:Main", - "//Wallet:Wallet", - ], - "optionSet" : { - "BazelBuildOptionsDebug" : { - "p" : "$(inherited) --features=swift.use_global_module_cache --features=swift.swift.no_generated_header --spawn_strategy=standalone --strategy=SwiftCompile=standalone --define=wallet_bundle_id=org.ton.TonWallet-iOS" - }, - "BazelBuildOptionsRelease" : { - "p" : "$(inherited)" - }, - "BazelBuildStartupOptionsDebug" : { - "p" : "$(inherited)" - }, - "BazelBuildStartupOptionsRelease" : { - "p" : "$(inherited)" - }, - "BuildActionPostActionScript" : { - "p" : "$(inherited)" - }, - "BuildActionPreActionScript" : { - "p" : "$(inherited)" - }, - "CommandlineArguments" : { - "p" : "$(inherited)" - }, - "EnvironmentVariables" : { - "p" : "$(inherited)" - }, - "LaunchActionPostActionScript" : { - "p" : "$(inherited)" - }, - "LaunchActionPreActionScript" : { - "p" : "$(inherited)" - }, - "ProjectGenerationBazelStartupOptions" : { - "p" : "$(inherited)" - }, - "ProjectPrioritizesSwift" : { - "p" : "YES" - }, - "TestActionPostActionScript" : { - "p" : "$(inherited)" - }, - "TestActionPreActionScript" : { - "p" : "$(inherited)" - } - }, - "projectName" : "Wallet", - "sourceFilters" : [ - "Wallet", - "Wallet/Sources", - "Wallet/SupportFiles", - "submodules/...", - ] -} diff --git a/Wallet/Wallet.tulsiproj/peter.tulsiconf-user b/Wallet/Wallet.tulsiproj/peter.tulsiconf-user deleted file mode 100644 index 4cae5c3523..0000000000 --- a/Wallet/Wallet.tulsiproj/peter.tulsiconf-user +++ /dev/null @@ -1,10 +0,0 @@ -{ - "optionSet" : { - "BazelPath" : { - "p" : "/usr/local/bin/bazel" - }, - "WorkspaceRootPath" : { - "p" : "/Users/peter/build/telegram-temp/telegram-ios" - } - } -} diff --git a/Wallet/Wallet.tulsiproj/project.tulsiconf b/Wallet/Wallet.tulsiproj/project.tulsiconf deleted file mode 100644 index 59fbd3b6ac..0000000000 --- a/Wallet/Wallet.tulsiproj/project.tulsiconf +++ /dev/null @@ -1,14 +0,0 @@ -{ - "configDefaults" : { - "optionSet" : { - "ProjectPrioritizesSwift" : { - "p" : "YES" - } - } - }, - "packages" : [ - "Wallet" - ], - "projectName" : "Wallet", - "workspaceRoot" : "../.." -} diff --git a/submodules/TonBinding/Sources/TON.h b/submodules/TonBinding/Sources/TON.h index 2a373115f0..85a37142a9 100644 --- a/submodules/TonBinding/Sources/TON.h +++ b/submodules/TonBinding/Sources/TON.h @@ -39,15 +39,43 @@ NS_ASSUME_NONNULL_BEGIN @end +@protocol TONTransactionMessageContents + +@end + +@interface TONTransactionMessageContentsRawData : NSObject + +@property (nonatomic, strong, readonly) NSData * _Nonnull data; + +- (instancetype)initWithData:(NSData * _Nonnull)data; + +@end + +@interface TONTransactionMessageContentsPlainText : NSObject + +@property (nonatomic, strong, readonly) NSString * _Nonnull text; + +- (instancetype)initWithText:(NSString * _Nonnull)text; + +@end + +@interface TONTransactionMessageContentsEncryptedText : NSObject + +@property (nonatomic, strong, readonly) NSData * _Nonnull data; + +- (instancetype)initWithData:(NSData * _Nonnull)data; + +@end + @interface TONTransactionMessage : NSObject @property (nonatomic, readonly) int64_t value; @property (nonatomic, strong, readonly) NSString * _Nonnull source; @property (nonatomic, strong, readonly) NSString * _Nonnull destination; -@property (nonatomic, strong, readonly) NSString * _Nonnull textMessage; +@property (nonatomic, strong, readonly) id _Nonnull contents; @property (nonatomic, strong, readonly) NSData * _Nonnull bodyHash; -- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination textMessage:(NSString * _Nonnull)textMessage bodyHash:(NSData * _Nonnull)bodyHash; +- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination contents:(id _Nonnull)contents bodyHash:(NSData * _Nonnull)bodyHash; @end @@ -87,10 +115,10 @@ NS_ASSUME_NONNULL_BEGIN @interface TONSendGramsQueryFees : NSObject -@property (nonatomic, strong, readonly) TONFees *sourceFees; -@property (nonatomic, strong, readonly) TONFees *destinationFees; +@property (nonatomic, strong, readonly) TONFees * _Nonnull sourceFees; +@property (nonatomic, strong, readonly) NSArray * _Nonnull destinationFees; -- (instancetype)initWithSourceFees:(TONFees *)sourceFees destinationFees:(TONFees *)destinationFees; +- (instancetype)initWithSourceFees:(TONFees * _Nonnull)sourceFees destinationFees:(NSArray * _Nonnull)destinationFees; @end diff --git a/submodules/TonBinding/Sources/TON.mm b/submodules/TonBinding/Sources/TON.mm index 5fcbc52b53..9349077739 100644 --- a/submodules/TonBinding/Sources/TON.mm +++ b/submodules/TonBinding/Sources/TON.mm @@ -48,14 +48,38 @@ static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::obj } NSString *source = readString(message->source_); NSString *destination = readString(message->destination_); - NSString *textMessage = readString(message->message_); + + id contents = nil; + if (message->msg_data_->get_id() == tonlib_api::msg_dataRaw::ID) { + auto msgData = tonlib_api::move_object_as(message->msg_data_); + contents = [[TONTransactionMessageContentsRawData alloc] initWithData:makeData(msgData->body_)]; + } else if (message->msg_data_->get_id() == tonlib_api::msg_dataText::ID) { + auto msgData = tonlib_api::move_object_as(message->msg_data_); + NSString *text = readString(msgData->text_); + if (text == nil) { + contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:@""]; + } else { + contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:text]; + } + } else if (message->msg_data_->get_id() == tonlib_api::msg_dataDecryptedText::ID) { + auto msgData = tonlib_api::move_object_as(message->msg_data_); + NSString *text = readString(msgData->text_); + if (text == nil) { + contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:@""]; + } else { + contents = [[TONTransactionMessageContentsPlainText alloc] initWithText:text]; + } + } else if (message->msg_data_->get_id() == tonlib_api::msg_dataEncryptedText::ID) { + auto msgData = tonlib_api::move_object_as(message->msg_data_); + contents = [[TONTransactionMessageContentsEncryptedText alloc] initWithData:makeData(msgData->text_)]; + } else { + contents = [[TONTransactionMessageContentsRawData alloc] initWithData:[NSData data]]; + } + if (source == nil || destination == nil) { return nil; } - if (textMessage == nil) { - textMessage = @""; - } - return [[TONTransactionMessage alloc] initWithValue:message->value_ source:source destination:destination textMessage:textMessage bodyHash:makeData(message->body_hash_)]; + return [[TONTransactionMessage alloc] initWithValue:message->value_ source:source destination:destination contents:contents bodyHash:makeData(message->body_hash_)]; } @implementation TONKey @@ -100,15 +124,51 @@ static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::obj @end +@implementation TONTransactionMessageContentsRawData + +- (instancetype)initWithData:(NSData * _Nonnull)data { + self = [super init]; + if (self != nil) { + _data = data; + } + return self; +} + +@end + +@implementation TONTransactionMessageContentsPlainText + +- (instancetype)initWithText:(NSString * _Nonnull)text { + self = [super init]; + if (self != nil) { + _text = text; + } + return self; +} + +@end + +@implementation TONTransactionMessageContentsEncryptedText + +- (instancetype)initWithData:(NSData * _Nonnull)data { + self = [super init]; + if (self != nil) { + _data = data; + } + return self; +} + +@end + @implementation TONTransactionMessage -- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination textMessage:(NSString * _Nonnull)textMessage bodyHash:(NSData * _Nonnull)bodyHash { +- (instancetype)initWithValue:(int64_t)value source:(NSString * _Nonnull)source destination:(NSString * _Nonnull)destination contents:(id _Nonnull)contents bodyHash:(NSData * _Nonnull)bodyHash { self = [super init]; if (self != nil) { _value = value; _source = source; _destination = destination; - _textMessage = textMessage; + _contents = contents; _bodyHash = bodyHash; } return self; @@ -164,7 +224,7 @@ static TONTransactionMessage * _Nullable parseTransactionMessage(tonlib_api::obj @implementation TONSendGramsQueryFees -- (instancetype)initWithSourceFees:(TONFees *)sourceFees destinationFees:(TONFees *)destinationFees { +- (instancetype)initWithSourceFees:(TONFees * _Nonnull)sourceFees destinationFees:(NSArray * _Nonnull)destinationFees { self = [super init]; if (self != nil) { _sourceFees = sourceFees; @@ -582,11 +642,14 @@ typedef enum { } }]; - auto query = make_object( - make_object( - makeString(publicKeyData), - initialWalletId - ) + auto initialAccountState = make_object( + makeString(publicKeyData), + initialWalletId + ); + + auto query = make_object( + tonlib_api::move_object_as(initialAccountState), + 1 ); _client->send({ requestId, std::move(query) }); @@ -604,36 +667,31 @@ typedef enum { if (object->get_id() == tonlib_api::error::ID) { auto error = tonlib_api::move_object_as(object); [subscriber putError:[[TONError alloc] initWithText:[[NSString alloc] initWithUTF8String:error->message_.c_str()]]]; - } else if (object->get_id() == tonlib_api::generic_accountStateUninited::ID) { - auto result = tonlib_api::move_object_as(object); - TONTransactionId *lastTransactionId = nil; - if (result->account_state_->last_transaction_id_ != nullptr) { - lastTransactionId = [[TONTransactionId alloc] initWithLt:result->account_state_->last_transaction_id_->lt_ transactionHash:makeData(result->account_state_->last_transaction_id_->hash_)]; + } else if (object->get_id() == tonlib_api::fullAccountState::ID) { + auto fullAccountState = tonlib_api::move_object_as(object); + int32_t seqNo = -1; + if (fullAccountState->account_state_->get_id() == tonlib_api::uninited_accountState::ID) { + seqNo = -1; + } else if (fullAccountState->account_state_->get_id() == tonlib_api::wallet_v3_accountState::ID) { + auto v3AccountState = tonlib_api::move_object_as(fullAccountState->account_state_); + seqNo = v3AccountState->seqno_; + } else { + [subscriber putError:[[TONError alloc] initWithText:@"Unknown type"]]; + return; } - [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:false balance:result->account_state_->balance_ seqno:-1 lastTransactionId:lastTransactionId syncUtime:result->account_state_->sync_utime_]]; - [subscriber putCompletion]; - } else if (object->get_id() == tonlib_api::generic_accountStateWallet::ID) { - auto result = tonlib_api::move_object_as(object); + TONTransactionId *lastTransactionId = nil; - if (result->account_state_->last_transaction_id_ != nullptr) { - lastTransactionId = [[TONTransactionId alloc] initWithLt:result->account_state_->last_transaction_id_->lt_ transactionHash:makeData(result->account_state_->last_transaction_id_->hash_)]; + if (fullAccountState->last_transaction_id_ != nullptr) { + lastTransactionId = [[TONTransactionId alloc] initWithLt:fullAccountState->last_transaction_id_->lt_ transactionHash:makeData(fullAccountState->last_transaction_id_->hash_)]; } - [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:true balance:result->account_state_->balance_ seqno:result->account_state_->seqno_ lastTransactionId:lastTransactionId syncUtime:result->account_state_->sync_utime_]]; + [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:false balance:fullAccountState->balance_ seqno:-1 lastTransactionId:lastTransactionId syncUtime:fullAccountState->sync_utime_]]; [subscriber putCompletion]; - } else if (object->get_id() == tonlib_api::generic_accountStateWalletV3::ID) { - auto result = tonlib_api::move_object_as(object); - TONTransactionId *lastTransactionId = nil; - if (result->account_state_->last_transaction_id_ != nullptr) { - lastTransactionId = [[TONTransactionId alloc] initWithLt:result->account_state_->last_transaction_id_->lt_ transactionHash:makeData(result->account_state_->last_transaction_id_->hash_)]; - } - [subscriber putNext:[[TONAccountState alloc] initWithIsInitialized:true balance:result->account_state_->balance_ seqno:result->account_state_->seqno_ lastTransactionId:lastTransactionId syncUtime:result->account_state_->sync_utime_]]; - [subscriber putCompletion]; - }else { + } else { assert(false); } }]; - auto query = make_object(make_object(accountAddress.UTF8String)); + auto query = make_object(make_object(accountAddress.UTF8String)); _client->send({ requestId, std::move(query) }); return [[SBlockDisposable alloc] initWithBlock:^{ @@ -681,7 +739,21 @@ typedef enum { } }]; - auto query = make_object( + auto inputMessageData = make_object( + makeString(textMessage) + ); + std::vector > inputMessages; + inputMessages.push_back(make_object( + make_object(address.UTF8String), + amount, + tonlib_api::move_object_as(inputMessageData) + )); + auto inputAction = make_object( + std::move(inputMessages), + forceIfDestinationNotInitialized + ); + + auto query = make_object( make_object( make_object( makeString(publicKeyData), @@ -690,11 +762,8 @@ typedef enum { makeSecureString(localPassword) ), make_object(fromAddress.UTF8String), - make_object(address.UTF8String), - amount, timeout, - forceIfDestinationNotInitialized, - makeString(textMessage) + tonlib_api::move_object_as(inputAction) ); _client->send({ requestId, std::move(query) }); @@ -723,14 +792,25 @@ typedef enum { } }]; - auto query = make_object( - make_object(), - make_object(fromAddress.UTF8String), + auto inputMessageData = make_object( + makeString(textMessage) + ); + std::vector > inputMessages; + inputMessages.push_back(make_object( make_object(address.UTF8String), amount, + tonlib_api::move_object_as(inputMessageData) + )); + auto inputAction = make_object( + std::move(inputMessages), + forceIfDestinationNotInitialized + ); + + auto query = make_object( + make_object(), + make_object(fromAddress.UTF8String), timeout, - forceIfDestinationNotInitialized, - makeString(textMessage) + tonlib_api::move_object_as(inputAction) ); _client->send({ requestId, std::move(query) }); @@ -751,7 +831,12 @@ typedef enum { } else if (object->get_id() == tonlib_api::query_fees::ID) { auto result = tonlib_api::move_object_as(object); TONFees *sourceFees = [[TONFees alloc] initWithInFwdFee:result->source_fees_->in_fwd_fee_ storageFee:result->source_fees_->storage_fee_ gasFee:result->source_fees_->gas_fee_ fwdFee:result->source_fees_->fwd_fee_]; - TONFees *destinationFees = [[TONFees alloc] initWithInFwdFee:result->destination_fees_->in_fwd_fee_ storageFee:result->destination_fees_->storage_fee_ gasFee:result->destination_fees_->gas_fee_ fwdFee:result->destination_fees_->fwd_fee_]; + NSMutableArray *destinationFees = [[NSMutableArray alloc] init]; + for (auto &fee : result->destination_fees_) { + TONFees *destinationFee = [[TONFees alloc] initWithInFwdFee:fee->in_fwd_fee_ storageFee:fee->storage_fee_ gasFee:fee->gas_fee_ fwdFee:fee->fwd_fee_]; + [destinationFees addObject:destinationFee]; + } + [subscriber putNext:[[TONSendGramsQueryFees alloc] initWithSourceFees:sourceFees destinationFees:destinationFees]]; [subscriber putCompletion]; } else { @@ -978,6 +1063,7 @@ typedef enum { }]; auto query = make_object( + make_object(), make_object( makeString(addressData) ), diff --git a/submodules/WalletCore/Sources/WalletCore.swift b/submodules/WalletCore/Sources/WalletCore.swift index b39f7dd95a..bca23575fc 100644 --- a/submodules/WalletCore/Sources/WalletCore.swift +++ b/submodules/WalletCore/Sources/WalletCore.swift @@ -1060,18 +1060,73 @@ private extension WalletTransactionId { } } +public enum WalletTransactionMessageContentsDecodingError: Error { + case generic +} + +public enum WalletTransactionMessageContents: Codable, Equatable { + enum Key: CodingKey { + case raw + case plainText + case encryptedText + } + + case raw(Data) + case plainText(String) + case encryptedText(Data) + + public init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: Key.self) + if let data = try? container.decode(Data.self, forKey: .raw) { + self = .raw(data) + } else if let plainText = try? container.decode(String.self, forKey: .plainText) { + self = .plainText(plainText) + } else if let encryptedText = try? container.decode(Data.self, forKey: .encryptedText) { + self = .encryptedText(encryptedText) + } else { + throw WalletTransactionMessageContentsDecodingError.generic + } + } + + public func encode(to encoder: Encoder) throws { + var container = try encoder.container(keyedBy: Key.self) + switch self { + case let .raw(data): + try container.encode(data, forKey: .raw) + case let .plainText(text): + try container.encode(text, forKey: .plainText) + case let .encryptedText(data): + try container.encode(data, forKey: .encryptedText) + } + } +} + +private extension WalletTransactionMessageContents { + init(tonTransactionMessageContents: TONTransactionMessageContents) { + if let raw = tonTransactionMessageContents as? TONTransactionMessageContentsRawData { + self = .raw(raw.data) + } else if let plainText = tonTransactionMessageContents as? TONTransactionMessageContentsPlainText { + self = .plainText(plainText.text) + } else if let encryptedText = tonTransactionMessageContents as? TONTransactionMessageContentsEncryptedText { + self = .encryptedText(encryptedText.data) + } else { + self = .raw(Data()) + } + } +} + public final class WalletTransactionMessage: Codable, Equatable { public let value: Int64 public let source: String public let destination: String - public let textMessage: String + public let contents: WalletTransactionMessageContents public let bodyHash: Data - init(value: Int64, source: String, destination: String, textMessage: String, bodyHash: Data) { + init(value: Int64, source: String, destination: String, contents: WalletTransactionMessageContents, bodyHash: Data) { self.value = value self.source = source self.destination = destination - self.textMessage = textMessage + self.contents = contents self.bodyHash = bodyHash } @@ -1085,7 +1140,7 @@ public final class WalletTransactionMessage: Codable, Equatable { if lhs.destination != rhs.destination { return false } - if lhs.textMessage != rhs.textMessage { + if lhs.contents != rhs.contents { return false } if lhs.bodyHash != rhs.bodyHash { @@ -1097,7 +1152,7 @@ public final class WalletTransactionMessage: Codable, Equatable { private extension WalletTransactionMessage { convenience init(tonTransactionMessage: TONTransactionMessage) { - self.init(value: tonTransactionMessage.value, source: tonTransactionMessage.source, destination: tonTransactionMessage.destination, textMessage: tonTransactionMessage.textMessage, bodyHash: tonTransactionMessage.bodyHash) + self.init(value: tonTransactionMessage.value, source: tonTransactionMessage.source, destination: tonTransactionMessage.destination, contents: WalletTransactionMessageContents(tonTransactionMessageContents: tonTransactionMessage.contents), bodyHash: tonTransactionMessage.bodyHash) } } diff --git a/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift b/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift index cef12fb45c..2240a179a7 100644 --- a/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift +++ b/submodules/WalletUI/Sources/WalletInfoTransactionItem.swift @@ -242,7 +242,14 @@ class WalletInfoTransactionItemNode: ListViewItemNode { if !description.isEmpty { description.append("\n") } - description.append(message.textMessage) + switch message.contents { + case .raw: + break + case .encryptedText: + description.append("") + case let .plainText(text): + description.append(text) + } } } case let .pending(transaction): @@ -268,7 +275,14 @@ class WalletInfoTransactionItemNode: ListViewItemNode { case let .completed(transaction): if let inMessage = transaction.inMessage { text = formatAddress(inMessage.source) - description = inMessage.textMessage + switch inMessage.contents { + case .raw: + description = "" + case .encryptedText: + description = "" + case let .plainText(text): + description = text + } } else { text = "" } diff --git a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift index 6d420a7ded..5aea1460da 100644 --- a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift +++ b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift @@ -106,11 +106,25 @@ private func extractDescription(_ walletTransaction: WalletInfoTransaction) -> S if !text.isEmpty { text.append("\n\n") } - text.append(message.textMessage) + switch message.contents { + case .raw: + break + case .encryptedText: + text.append("") + case let .plainText(plainText): + text.append(plainText) + } } } else { if let inMessage = walletTransaction.inMessage { - text = inMessage.textMessage + switch inMessage.contents { + case .raw: + text = "" + case .encryptedText: + text = "" + case let .plainText(plainText): + text = plainText + } } } return text diff --git a/submodules/ton/BUILD b/submodules/ton/BUILD index 15e274e8b9..a78da4452a 100644 --- a/submodules/ton/BUILD +++ b/submodules/ton/BUILD @@ -35,12 +35,19 @@ ton_lib_names = [ "tonlib", ] +filegroup( + name = "TonSources", + srcs = glob([ + "tonlib-src/**/*" + ]), +) + genrule( name = "ton_build", srcs = [ "build-ton-bazel.sh", "iOS-bazel.cmake", - "tonlib-src.tar.gz", + ":TonSources", "//submodules/openssl:openssl_include", "//submodules/openssl:libcrypto.a", ], @@ -70,7 +77,10 @@ genrule( cp $(location :build-ton-bazel.sh) "$$BUILD_DIR/" cp $(location :iOS-bazel.cmake) "$$BUILD_DIR/" - tar -xzf $(location tonlib-src.tar.gz) -C "$$BUILD_DIR/" + + SOURCE_PATH="submodules/tonlib/tonlib-src" + + cp -R "$$SOURCE_PATH" "$$BUILD_DIR/" mkdir -p "$$BUILD_DIR/openssl_headers/include/openssl" mkdir -p "$$BUILD_DIR/openssl_headers/lib" diff --git a/submodules/ton/tonlib-src.tar.gz b/submodules/ton/tonlib-src.tar.gz deleted file mode 100644 index e9f5ac49de..0000000000 Binary files a/submodules/ton/tonlib-src.tar.gz and /dev/null differ diff --git a/submodules/ton/tonlib-src/LGPLv2 b/submodules/ton/tonlib-src/LGPLv2 index d93ab1b9a3..ab2bc125c4 100644 --- a/submodules/ton/tonlib-src/LGPLv2 +++ b/submodules/ton/tonlib-src/LGPLv2 @@ -14,5 +14,5 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ diff --git a/submodules/ton/tonlib-src/README b/submodules/ton/tonlib-src/README index 7379d91e51..a47456e22b 100644 --- a/submodules/ton/tonlib-src/README +++ b/submodules/ton/tonlib-src/README @@ -8,18 +8,19 @@ The software is likely to compile and work properly on most Linux systems. It sh BASIC COMPILATION AND INSTALLATION INSTRUCTIONS -1) Download and unpack the newest version of this archive, available at +1) Download the newest version of the TON blockchain sources, available at GitHub repository https://github.com/ton-blockchain/ton/ : -https://test.ton.org/download +git clone https://github.com/ton-blockchain/ton.git +git submodule update The TON Blockchain Test Network is updated quite often, so we cannot guarantee that older versions of the Lite Client will always work. Backward compatibility is not enforced at this development stage. 2) Install the newest versions of make, cmake (version 3.0.2 or later), OpenSSL (including C header files), and g++ or clang (or another C++14-compatible compiler as appropriate for your operating system). We strongly recommend installing OpenSSL version 1.1.1 or later for better performance, especially if you intend to run a Full Node or a Validator as well. -3) Suppose that you have unpacked this archive to directory ~/lite-client, where ~ is your home directory, and that you have created an empty directory ~/liteclient-build. Then run the following in a terminal on a Linux system: +3) Suppose that you have fetched the source tree to directory ~/ton, where ~ is your home directory, and that you have created an empty directory ~/liteclient-build. Then run the following in a terminal on a Linux system: cd ~/liteclient-build -cmake ~/lite-client +cmake ~/ton cmake --build . --target lite-client You might also build some extra utilities useful for smart-contract development: diff --git a/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp b/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp index 84f425f8a2..2d3ade1644 100644 --- a/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp +++ b/submodules/ton/tonlib-src/adnl/adnl-node-id.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -75,6 +75,10 @@ class AdnlNodeIdShort { return hash_.is_zero(); } + static td::Result parse(td::Slice key); + + std::string serialize(); + private: PublicKeyHash hash_; }; diff --git a/submodules/ton/tonlib-src/common/int-to-string.hpp b/submodules/ton/tonlib-src/common/int-to-string.hpp index 414342cd0f..88aecc6549 100644 --- a/submodules/ton/tonlib-src/common/int-to-string.hpp +++ b/submodules/ton/tonlib-src/common/int-to-string.hpp @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #pragma once #include "td/utils/int_types.h" diff --git a/submodules/ton/tonlib-src/crypto/CMakeLists.txt b/submodules/ton/tonlib-src/crypto/CMakeLists.txt index 10977b44b3..37f427cae2 100644 --- a/submodules/ton/tonlib-src/crypto/CMakeLists.txt +++ b/submodules/ton/tonlib-src/crypto/CMakeLists.txt @@ -23,6 +23,7 @@ set(TON_CRYPTO_SOURCE vm/atom.cpp vm/continuation.cpp vm/dict.cpp + vm/memo.cpp vm/dispatch.cpp vm/opctable.cpp vm/cp0.cpp @@ -35,6 +36,8 @@ set(TON_CRYPTO_SOURCE vm/debugops.cpp vm/tonops.cpp vm/boc.cpp + vm/utils.cpp + vm/vm.cpp tl/tlblib.cpp Ed25519.h @@ -74,12 +77,15 @@ set(TON_CRYPTO_SOURCE vm/excno.hpp vm/fmt.hpp vm/log.h + vm/memo.h vm/opctable.h vm/stack.hpp vm/stackops.h vm/tupleops.h vm/tonops.h vm/vmstate.h + vm/utils.h + vm/vm.h vm/cells.h vm/cellslice.h @@ -201,6 +207,9 @@ set(BLOCK_SOURCE set(SMC_ENVELOPE_SOURCE smc-envelope/GenericAccount.cpp + smc-envelope/HighloadWallet.cpp + smc-envelope/HighloadWalletV2.cpp + smc-envelope/ManualDns.cpp smc-envelope/MultisigWallet.cpp smc-envelope/SmartContract.cpp smc-envelope/SmartContractCode.cpp @@ -210,12 +219,16 @@ set(SMC_ENVELOPE_SOURCE smc-envelope/WalletV3.cpp smc-envelope/GenericAccount.h + smc-envelope/HighloadWallet.h + smc-envelope/HighloadWalletV2.h + smc-envelope/ManualDns.h smc-envelope/MultisigWallet.h smc-envelope/SmartContract.h smc-envelope/SmartContractCode.h smc-envelope/TestGiver.h smc-envelope/TestWallet.h smc-envelope/Wallet.h + smc-envelope/WalletInterface.h smc-envelope/WalletV3.h ) @@ -343,7 +356,7 @@ if (NOT CMAKE_CROSSCOMPILING) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND fift -Ifift/lib:smartcont -s asm-to-cpp.fif ${ARG_DEST_FIF} ${ARG_DEST_CPP} ${ARG_NAME} MAIN_DEPENDENCY ${ARG_SOURCE} - DEPENDS fift ${ARG_DEST_FIF} smartcont/asm-to-cpp.fif + DEPENDS fift ${ARG_DEST_FIF} smartcont/asm-to-cpp.fif fift/lib/Asm.fif OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_DEST_CPP} ) add_custom_target(gen_fif_${ID} DEPENDS ${ARG_DEST_FIF} ${ARG_DEST_CPP}) @@ -355,12 +368,15 @@ if (NOT CMAKE_CROSSCOMPILING) GenFif(DEST smartcont/auto/wallet3-code SOURCE smartcont/wallet3-code.fc NAME wallet3) GenFif(DEST smartcont/auto/simple-wallet-code SOURCE smartcont/simple-wallet-code.fc NAME simple-wallet) GenFif(DEST smartcont/auto/highload-wallet-code SOURCE smartcont/highload-wallet-code.fc NAME highload-wallet) - GenFif(DEST smartcont/auto/highload-wallet-v2-code SOURCE smartcont/highload-wallet-v2-code.fc NAME highoad-wallet-v2) + GenFif(DEST smartcont/auto/highload-wallet-v2-code SOURCE smartcont/highload-wallet-v2-code.fc NAME highload-wallet-v2) GenFif(DEST smartcont/auto/elector-code SOURCE smartcont/elector-code.fc NAME elector-code) GenFif(DEST smartcont/auto/multisig-code SOURCE smartcont/multisig-code.fc NAME multisig) GenFif(DEST smartcont/auto/restricted-wallet-code SOURCE smartcont/restricted-wallet-code.fc NAME restricted-wallet) GenFif(DEST smartcont/auto/restricted-wallet2-code SOURCE smartcont/restricted-wallet2-code.fc NAME restricted-wallet2) + GenFif(DEST smartcont/auto/dns-manual-code SOURCE smartcont/dns-manual-code.fc NAME dns-manual) + GenFif(DEST smartcont/auto/dns-auto-code SOURCE smartcont/dns-auto-code.fc NAME dns-auto) + GenFif(DEST smartcont/auto/simple-wallet-ext-code SOURCE smartcont/simple-wallet-ext-code.fc NAME simple-wallet-ext) endif() @@ -387,5 +403,13 @@ if (WINGETOPT_FOUND) target_link_libraries_system(dump-block wingetopt) endif() +add_executable(adjust-block block/adjust-block.cpp) +target_include_directories(adjust-block PUBLIC $ + $) +target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib ton_block) +if (WINGETOPT_FOUND) + target_link_libraries_system(dump-block wingetopt) +endif() + install(TARGETS fift func RUNTIME DESTINATION bin) install(DIRECTORY fift/lib/ DESTINATION lib/fift) diff --git a/submodules/ton/tonlib-src/crypto/block/adjust-block.cpp b/submodules/ton/tonlib-src/crypto/block/adjust-block.cpp new file mode 100644 index 0000000000..ba9d22cdae --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/block/adjust-block.cpp @@ -0,0 +1,203 @@ +/* + This file is part of TON Blockchain source code. + + TON Blockchain is free software; you can redistribute it and/or + modify it under the terms of the GNU 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 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with TON Blockchain. If not, see . + + In addition, as a special exception, the copyright holders give permission + to link the code of portions of this program with the OpenSSL library. + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the file(s), + but you are not obligated to do so. If you do not wish to do so, delete this + exception statement from your version. If you delete this exception statement + from all source files in the program, then also delete it here. + + Copyright 2017-2019 Telegram Systems LLP +*/ +#include "block/block.h" +#include "vm/boc.h" +#include +#include "block-db.h" +#include "block-auto.h" +#include "block-parse.h" +#include "vm/cp0.h" +#include "td/utils/crypto.h" +#include + +using td::Ref; +using namespace std::literals::string_literals; + +int verbosity; + +struct IntError { + std::string err_msg; + IntError(std::string _msg) : err_msg(_msg) { + } + IntError(const char* _msg) : err_msg(_msg) { + } +}; + +int fatal(std::string str) { + std::cerr << "fatal error: " << str << std::endl; + std::exit(2); + return 2; +} + +static inline void fail_unless(td::Status res) { + if (res.is_error()) { + throw IntError{res.to_string()}; + } +} + +td::Ref load_block(std::string filename, ton::BlockIdExt& id) { + std::cerr << "loading block from bag-of-cell file " << filename << std::endl; + auto bytes_res = block::load_binary_file(filename); + if (bytes_res.is_error()) { + throw IntError{PSTRING() << "cannot load file `" << filename << "` : " << bytes_res.move_as_error()}; + } + ton::FileHash fhash; + td::sha256(bytes_res.ok(), fhash.as_slice()); + vm::BagOfCells boc; + auto res = boc.deserialize(bytes_res.move_as_ok()); + if (res.is_error()) { + throw IntError{PSTRING() << "cannot deserialize bag-of-cells " << res.move_as_error()}; + } + if (res.move_as_ok() <= 0 || boc.get_root_cell().is_null()) { + throw IntError{"cannot deserialize bag-of-cells"}; + } + auto root = boc.get_root_cell(); + std::vector prev; + ton::BlockIdExt mc_blkid; + bool after_split; + fail_unless(block::unpack_block_prev_blk_try(root, id, prev, mc_blkid, after_split, &id)); + id.file_hash = fhash; + std::cerr << "loaded block " << id.to_str() << std::endl; + return root; +} + +bool save_block(std::string filename, Ref root, ton::BlockIdExt& id) { + std::cerr << "saving block into bag-of-cell file " << filename << std::endl; + if (root.is_null()) { + throw IntError{"new block has no root"}; + } + id.root_hash = root->get_hash().bits(); + auto res = vm::std_boc_serialize(std::move(root), 31); + if (res.is_error()) { + throw IntError{PSTRING() << "cannot serialize modified block as a bag-of-cells: " + << res.move_as_error().to_string()}; + } + auto data = res.move_as_ok(); + td::sha256(data, id.file_hash.as_slice()); + auto res1 = block::save_binary_file(filename, std::move(data)); + if (res1.is_error()) { + throw IntError{PSTRING() << "cannot save file `" << filename << "` : " << res1}; + } + return true; +} + +Ref adjust_block(Ref root, int vseqno_incr, const ton::BlockIdExt& id) { + std::vector prev; + ton::BlockIdExt mc_blkid; + bool after_split; + fail_unless(block::unpack_block_prev_blk_try(root, id, prev, mc_blkid, after_split)); + std::cerr << "unpacked header of block " << id.to_str() << std::endl; + if (!id.is_masterchain()) { + throw IntError{"can modify only masterchain blocks"}; + } + block::gen::Block::Record blk; + block::gen::BlockInfo::Record info; + if (!(tlb::unpack_cell(root, blk) && tlb::unpack_cell(blk.info, info))) { + throw IntError{"cannot unpack block header"}; + } + if (!info.key_block) { + throw IntError{"can modify only key blocks"}; + } + info.vert_seqno_incr = true; + info.vert_seq_no += vseqno_incr; + if (!block::tlb::t_ExtBlkRef.pack_to(info.prev_vert_ref, id, info.end_lt)) { + throw IntError{"cannot pack prev_vert_ref"}; + } + if (!(tlb::pack_cell(blk.info, info) && tlb::pack_cell(root, blk))) { + throw IntError{"cannot pack block header"}; + } + return root; +} + +void usage() { + std::cout << "usage: adjust-block [-i] \n\tor adjust-block -h\n\tAdjusts block " + "loaded from by incrementing vert_seqno by (1 by default)\n"; + std::exit(3); +} + +int main(int argc, char* const argv[]) { + int i, vseqno_incr = 1; + int new_verbosity_level = VERBOSITY_NAME(INFO); + std::string in_fname, out_fname; + while ((i = getopt(argc, argv, "hi:v:")) != -1) { + switch (i) { + case 'h': + usage(); + break; + case 'i': + vseqno_incr = td::to_integer(td::Slice(optarg)); + CHECK(vseqno_incr > 0 && vseqno_incr < 1000); + break; + case 'v': + new_verbosity_level = VERBOSITY_NAME(FATAL) + (verbosity = td::to_integer(td::Slice(optarg))); + break; + default: + usage(); + break; + } + } + SET_VERBOSITY_LEVEL(new_verbosity_level); + if (argc != optind + 2) { + usage(); + return 2; + } + in_fname = argv[optind]; + out_fname = argv[optind + 1]; + try { + ton::BlockIdExt old_id, new_id; + auto root = load_block(in_fname, old_id); + if (root.is_null()) { + return fatal("cannot load BoC from file "s + in_fname); + } + bool ok = block::gen::t_Block.validate_ref(root); + if (!ok) { + return fatal("file `"s + in_fname + " does not contain a valid block"); + } + auto adjusted = adjust_block(root, vseqno_incr, old_id); + if (adjusted.is_null()) { + return fatal("cannot adjust block"); + } + ok = block::gen::t_Block.validate_ref(root); + if (!ok) { + return fatal("modified block is not valid"); + } + new_id = old_id; + if (!save_block(out_fname, adjusted, new_id)) { + return fatal("cannot save modified block to file `"s + out_fname + "`"); + } + std::cout << "old block id: " << old_id.to_str() << std::endl; + std::cout << "new block id: " << new_id.to_str() << std::endl; + } catch (IntError& err) { + std::cerr << "internal error: " << err.err_msg << std::endl; + return 1; + } catch (vm::VmError& err) { + std::cerr << "vm error: " << err.get_msg() << std::endl; + return 1; + } + return 0; +} diff --git a/submodules/ton/tonlib-src/crypto/block/block-auto.cpp b/submodules/ton/tonlib-src/crypto/block/block-auto.cpp index d3d666fb75..d2bf8aea89 100644 --- a/submodules/ton/tonlib-src/crypto/block/block-auto.cpp +++ b/submodules/ton/tonlib-src/crypto/block/block-auto.cpp @@ -14,11 +14,16 @@ // uses built-in type `uint` // uses built-in type `bits` // uses built-in type `int8` +// uses built-in type `uint13` // uses built-in type `uint15` +// uses built-in type `int16` // uses built-in type `uint16` // uses built-in type `int32` // uses built-in type `uint32` +// uses built-in type `uint63` +// uses built-in type `int64` // uses built-in type `uint64` +// uses built-in type `int257` // uses built-in type `bits256` namespace block { @@ -273,7 +278,7 @@ int BoolFalse::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(1) == 0 ? bool_false : -1; } -bool BoolFalse::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BoolFalse::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(1) == 0; } @@ -340,7 +345,7 @@ int BoolTrue::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(1) == 1 ? bool_true : -1; } -bool BoolTrue::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BoolTrue::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(1) == 1; } @@ -423,13 +428,13 @@ bool Maybe::skip(vm::CellSlice& cs) const { return false; } -bool Maybe::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Maybe::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case nothing: return cs.advance(1); case just: return cs.advance(1) - && X_.validate_skip(cs, weak); + && X_.validate_skip(ops, cs, weak); } return false; } @@ -556,14 +561,14 @@ bool Either::skip(vm::CellSlice& cs) const { return false; } -bool Either::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Either::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case left: return cs.advance(1) - && X_.validate_skip(cs, weak); + && X_.validate_skip(ops, cs, weak); case right: return cs.advance(1) - && Y_.validate_skip(cs, weak); + && Y_.validate_skip(ops, cs, weak); } return false; } @@ -684,9 +689,9 @@ bool Both::skip(vm::CellSlice& cs) const { && Y_.skip(cs); } -bool Both::validate_skip(vm::CellSlice& cs, bool weak) const { - return X_.validate_skip(cs, weak) - && Y_.validate_skip(cs, weak); +bool Both::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return X_.validate_skip(ops, cs, weak) + && Y_.validate_skip(ops, cs, weak); } bool Both::unpack(vm::CellSlice& cs, Both::Record& data) const { @@ -812,11 +817,11 @@ bool Hashmap::skip(vm::CellSlice& cs) const { && HashmapNode{m, X_}.skip(cs); } -bool Hashmap::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Hashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int l, m; - return HmLabel{m_}.validate_skip(cs, weak, l) + return HmLabel{m_}.validate_skip(ops, cs, weak, l) && add_r1(m, l, m_) - && HashmapNode{m, X_}.validate_skip(cs, weak); + && HashmapNode{m, X_}.validate_skip(ops, cs, weak); } bool Hashmap::unpack(vm::CellSlice& cs, Hashmap::Record& data) const { @@ -889,16 +894,16 @@ bool HashmapNode::skip(vm::CellSlice& cs) const { return false; } -bool HashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case hmn_leaf: return m_ == 0 - && X_.validate_skip(cs, weak); + && X_.validate_skip(ops, cs, weak); case hmn_fork: { int n; return add_r1(n, 1, m_) - && Hashmap{n, X_}.validate_skip_ref(cs, weak) - && Hashmap{n, X_}.validate_skip_ref(cs, weak); + && Hashmap{n, X_}.validate_skip_ref(ops, cs, weak) + && Hashmap{n, X_}.validate_skip_ref(ops, cs, weak); } } return false; @@ -1077,12 +1082,12 @@ bool HmLabel::skip(vm::CellSlice& cs, int& m_) const { return false; } -bool HmLabel::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HmLabel::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case hml_short: { int m_; return cs.advance(1) - && t_Unary.validate_skip(cs, weak, m_) + && t_Unary.validate_skip(ops, cs, weak, m_) && m_ <= n_ && cs.advance(m_); } @@ -1101,11 +1106,11 @@ bool HmLabel::validate_skip(vm::CellSlice& cs, bool weak) const { return false; } -bool HmLabel::validate_skip(vm::CellSlice& cs, bool weak, int& m_) const { +bool HmLabel::validate_skip(int* ops, vm::CellSlice& cs, bool weak, int& m_) const { switch (get_tag(cs)) { case hml_short: return cs.advance(1) - && t_Unary.validate_skip(cs, weak, m_) + && t_Unary.validate_skip(ops, cs, weak, m_) && m_ <= n_ && cs.advance(m_); case hml_long: @@ -1360,20 +1365,20 @@ bool Unary::skip(vm::CellSlice& cs, int& m_) const { return false; } -bool Unary::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Unary::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case unary_zero: return cs.advance(1); case unary_succ: { int n; return cs.advance(1) - && validate_skip(cs, weak, n); + && validate_skip(ops, cs, weak, n); } } return false; } -bool Unary::validate_skip(vm::CellSlice& cs, bool weak, int& m_) const { +bool Unary::validate_skip(int* ops, vm::CellSlice& cs, bool weak, int& m_) const { switch (get_tag(cs)) { case unary_zero: return (m_ = 0) >= 0 @@ -1381,7 +1386,7 @@ bool Unary::validate_skip(vm::CellSlice& cs, bool weak, int& m_) const { case unary_succ: { int n; return cs.advance(1) - && validate_skip(cs, weak, n) + && validate_skip(ops, cs, weak, n) && (m_ = n + 1) >= 0; } } @@ -1545,13 +1550,13 @@ bool HashmapE::skip(vm::CellSlice& cs) const { return false; } -bool HashmapE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case hme_empty: return cs.advance(1); case hme_root: return cs.advance(1) - && Hashmap{m_, X_}.validate_skip_ref(cs, weak); + && Hashmap{m_, X_}.validate_skip_ref(ops, cs, weak); } return false; } @@ -1666,8 +1671,8 @@ bool BitstringSet::skip(vm::CellSlice& cs) const { return Hashmap{m_, t_True}.skip(cs); } -bool BitstringSet::validate_skip(vm::CellSlice& cs, bool weak) const { - return Hashmap{m_, t_True}.validate_skip(cs, weak); +bool BitstringSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return Hashmap{m_, t_True}.validate_skip(ops, cs, weak); } bool BitstringSet::unpack(vm::CellSlice& cs, BitstringSet::Record& data) const { @@ -1733,11 +1738,11 @@ bool HashmapAug::skip(vm::CellSlice& cs) const { && HashmapAugNode{m, X_, Y_}.skip(cs); } -bool HashmapAug::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapAug::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int l, m; - return HmLabel{m_}.validate_skip(cs, weak, l) + return HmLabel{m_}.validate_skip(ops, cs, weak, l) && add_r1(m, l, m_) - && HashmapAugNode{m, X_, Y_}.validate_skip(cs, weak); + && HashmapAugNode{m, X_, Y_}.validate_skip(ops, cs, weak); } bool HashmapAug::unpack(vm::CellSlice& cs, HashmapAug::Record& data) const { @@ -1812,18 +1817,18 @@ bool HashmapAugNode::skip(vm::CellSlice& cs) const { return false; } -bool HashmapAugNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapAugNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case ahmn_leaf: return m_ == 0 - && Y_.validate_skip(cs, weak) - && X_.validate_skip(cs, weak); + && Y_.validate_skip(ops, cs, weak) + && X_.validate_skip(ops, cs, weak); case ahmn_fork: { int n; return add_r1(n, 1, m_) - && HashmapAug{n, X_, Y_}.validate_skip_ref(cs, weak) - && HashmapAug{n, X_, Y_}.validate_skip_ref(cs, weak) - && Y_.validate_skip(cs, weak); + && HashmapAug{n, X_, Y_}.validate_skip_ref(ops, cs, weak) + && HashmapAug{n, X_, Y_}.validate_skip_ref(ops, cs, weak) + && Y_.validate_skip(ops, cs, weak); } } return false; @@ -1954,15 +1959,15 @@ bool HashmapAugE::skip(vm::CellSlice& cs) const { return false; } -bool HashmapAugE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapAugE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case ahme_empty: return cs.advance(1) - && Y_.validate_skip(cs, weak); + && Y_.validate_skip(ops, cs, weak); case ahme_root: return cs.advance(1) - && HashmapAug{m_, X_, Y_}.validate_skip_ref(cs, weak) - && Y_.validate_skip(cs, weak); + && HashmapAug{m_, X_, Y_}.validate_skip_ref(ops, cs, weak) + && Y_.validate_skip(ops, cs, weak); } return false; } @@ -2093,11 +2098,11 @@ bool VarHashmap::skip(vm::CellSlice& cs) const { && VarHashmapNode{m, X_}.skip(cs); } -bool VarHashmap::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarHashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int l, m; - return HmLabel{m_}.validate_skip(cs, weak, l) + return HmLabel{m_}.validate_skip(ops, cs, weak, l) && add_r1(m, l, m_) - && VarHashmapNode{m, X_}.validate_skip(cs, weak); + && VarHashmapNode{m, X_}.validate_skip(ops, cs, weak); } bool VarHashmap::unpack(vm::CellSlice& cs, VarHashmap::Record& data) const { @@ -2176,25 +2181,25 @@ bool VarHashmapNode::skip(vm::CellSlice& cs) const { return false; } -bool VarHashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarHashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case vhmn_leaf: return cs.advance(2) - && X_.validate_skip(cs, weak); + && X_.validate_skip(ops, cs, weak); case vhmn_fork: { int n; return add_r1(n, 1, m_) && cs.advance(2) - && VarHashmap{n, X_}.validate_skip_ref(cs, weak) - && VarHashmap{n, X_}.validate_skip_ref(cs, weak) - && Maybe{X_}.validate_skip(cs, weak); + && VarHashmap{n, X_}.validate_skip_ref(ops, cs, weak) + && VarHashmap{n, X_}.validate_skip_ref(ops, cs, weak) + && Maybe{X_}.validate_skip(ops, cs, weak); } case vhmn_cont: { int n; return add_r1(n, 1, m_) && cs.advance(2) - && VarHashmap{n, X_}.validate_skip_ref(cs, weak) - && X_.validate_skip(cs, weak); + && VarHashmap{n, X_}.validate_skip_ref(ops, cs, weak) + && X_.validate_skip(ops, cs, weak); } } return false; @@ -2360,13 +2365,13 @@ bool VarHashmapE::skip(vm::CellSlice& cs) const { return false; } -bool VarHashmapE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarHashmapE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case vhme_empty: return cs.advance(1); case vhme_root: return cs.advance(1) - && VarHashmap{m_, X_}.validate_skip_ref(cs, weak); + && VarHashmap{m_, X_}.validate_skip_ref(ops, cs, weak); } return false; } @@ -2484,11 +2489,11 @@ bool PfxHashmap::skip(vm::CellSlice& cs) const { && PfxHashmapNode{m, X_}.skip(cs); } -bool PfxHashmap::validate_skip(vm::CellSlice& cs, bool weak) const { +bool PfxHashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int l, m; - return HmLabel{m_}.validate_skip(cs, weak, l) + return HmLabel{m_}.validate_skip(ops, cs, weak, l) && add_r1(m, l, m_) - && PfxHashmapNode{m, X_}.validate_skip(cs, weak); + && PfxHashmapNode{m, X_}.validate_skip(ops, cs, weak); } bool PfxHashmap::unpack(vm::CellSlice& cs, PfxHashmap::Record& data) const { @@ -2556,17 +2561,17 @@ bool PfxHashmapNode::skip(vm::CellSlice& cs) const { return false; } -bool PfxHashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool PfxHashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case phmn_leaf: return cs.advance(1) - && X_.validate_skip(cs, weak); + && X_.validate_skip(ops, cs, weak); case phmn_fork: { int n; return add_r1(n, 1, m_) && cs.advance(1) - && PfxHashmap{n, X_}.validate_skip_ref(cs, weak) - && PfxHashmap{n, X_}.validate_skip_ref(cs, weak); + && PfxHashmap{n, X_}.validate_skip_ref(ops, cs, weak) + && PfxHashmap{n, X_}.validate_skip_ref(ops, cs, weak); } } return false; @@ -2714,13 +2719,13 @@ bool PfxHashmapE::skip(vm::CellSlice& cs) const { return false; } -bool PfxHashmapE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool PfxHashmapE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case phme_empty: return cs.advance(1); case phme_root: return cs.advance(1) - && PfxHashmap{m_, X_}.validate_skip_ref(cs, weak); + && PfxHashmap{m_, X_}.validate_skip_ref(ops, cs, weak); } return false; } @@ -2851,7 +2856,7 @@ bool MsgAddressExt::skip(vm::CellSlice& cs) const { return false; } -bool MsgAddressExt::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgAddressExt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case addr_none: return cs.advance(2); @@ -2984,7 +2989,7 @@ bool Anycast::skip(vm::CellSlice& cs) const { && cs.advance(depth); } -bool Anycast::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Anycast::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int depth; return cs.fetch_uint_leq(30, depth) && 1 <= depth @@ -3082,16 +3087,16 @@ bool MsgAddressInt::skip(vm::CellSlice& cs) const { return false; } -bool MsgAddressInt::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgAddressInt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case addr_std: return cs.advance(2) - && t_Maybe_Anycast.validate_skip(cs, weak) + && t_Maybe_Anycast.validate_skip(ops, cs, weak) && cs.advance(264); case addr_var: { int addr_len; return cs.advance(2) - && t_Maybe_Anycast.validate_skip(cs, weak) + && t_Maybe_Anycast.validate_skip(ops, cs, weak) && cs.fetch_uint_to(9, addr_len) && cs.advance(32) && cs.advance(addr_len); @@ -3229,12 +3234,12 @@ bool MsgAddress::skip(vm::CellSlice& cs) const { return false; } -bool MsgAddress::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case cons1: - return t_MsgAddressInt.validate_skip(cs, weak); + return t_MsgAddressInt.validate_skip(ops, cs, weak); case cons2: - return t_MsgAddressExt.validate_skip(cs, weak); + return t_MsgAddressExt.validate_skip(ops, cs, weak); } return false; } @@ -3347,7 +3352,7 @@ bool VarUInteger::skip(vm::CellSlice& cs) const { && cs.advance(8 * len); } -bool VarUInteger::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarUInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len; return cs.fetch_uint_less(m_, len) && cs.advance(8 * len); @@ -3421,7 +3426,7 @@ bool VarInteger::skip(vm::CellSlice& cs) const { && cs.advance(8 * len); } -bool VarInteger::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len; return cs.fetch_uint_less(m_, len) && cs.advance(8 * len); @@ -3493,8 +3498,8 @@ bool Grams::skip(vm::CellSlice& cs) const { return t_VarUInteger_16.skip(cs); } -bool Grams::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_16.validate_skip(cs, weak); +bool Grams::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_16.validate_skip(ops, cs, weak); } bool Grams::unpack(vm::CellSlice& cs, Grams::Record& data) const { @@ -3556,8 +3561,8 @@ bool ExtraCurrencyCollection::skip(vm::CellSlice& cs) const { return t_HashmapE_32_VarUInteger_32.skip(cs); } -bool ExtraCurrencyCollection::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapE_32_VarUInteger_32.validate_skip(cs, weak); +bool ExtraCurrencyCollection::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_32_VarUInteger_32.validate_skip(ops, cs, weak); } bool ExtraCurrencyCollection::unpack(vm::CellSlice& cs, ExtraCurrencyCollection::Record& data) const { @@ -3620,9 +3625,9 @@ bool CurrencyCollection::skip(vm::CellSlice& cs) const { && t_ExtraCurrencyCollection.skip(cs); } -bool CurrencyCollection::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Grams.validate_skip(cs, weak) - && t_ExtraCurrencyCollection.validate_skip(cs, weak); +bool CurrencyCollection::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Grams.validate_skip(ops, cs, weak) + && t_ExtraCurrencyCollection.validate_skip(ops, cs, weak); } bool CurrencyCollection::unpack(vm::CellSlice& cs, CurrencyCollection::Record& data) const { @@ -3720,25 +3725,25 @@ bool CommonMsgInfo::skip(vm::CellSlice& cs) const { return false; } -bool CommonMsgInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CommonMsgInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case int_msg_info: return cs.advance(4) - && t_MsgAddressInt.validate_skip(cs, weak) - && t_MsgAddressInt.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) && cs.advance(96); case ext_in_msg_info: return cs.advance(2) - && t_MsgAddressExt.validate_skip(cs, weak) - && t_MsgAddressInt.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_MsgAddressExt.validate_skip(ops, cs, weak) + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); case ext_out_msg_info: return cs.advance(2) - && t_MsgAddressInt.validate_skip(cs, weak) - && t_MsgAddressExt.validate_skip(cs, weak) + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && t_MsgAddressExt.validate_skip(ops, cs, weak) && cs.advance(96); } return false; @@ -3942,20 +3947,20 @@ bool CommonMsgInfoRelaxed::skip(vm::CellSlice& cs) const { return false; } -bool CommonMsgInfoRelaxed::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CommonMsgInfoRelaxed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case int_msg_info: return cs.advance(4) - && t_MsgAddress.validate_skip(cs, weak) - && t_MsgAddressInt.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) + && t_MsgAddress.validate_skip(ops, cs, weak) + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) && cs.advance(96); case ext_out_msg_info: return cs.fetch_ulong(2) == 3 - && t_MsgAddress.validate_skip(cs, weak) - && t_MsgAddressExt.validate_skip(cs, weak) + && t_MsgAddress.validate_skip(ops, cs, weak) + && t_MsgAddressExt.validate_skip(ops, cs, weak) && cs.advance(96); } return false; @@ -4139,12 +4144,12 @@ bool StateInit::skip(vm::CellSlice& cs) const { && t_HashmapE_256_SimpleLib.skip(cs); } -bool StateInit::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Maybe_natwidth_5.validate_skip(cs, weak) - && t_Maybe_TickTock.validate_skip(cs, weak) - && t_Maybe_Ref_Cell.validate_skip(cs, weak) - && t_Maybe_Ref_Cell.validate_skip(cs, weak) - && t_HashmapE_256_SimpleLib.validate_skip(cs, weak); +bool StateInit::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Maybe_natwidth_5.validate_skip(ops, cs, weak) + && t_Maybe_TickTock.validate_skip(ops, cs, weak) + && t_Maybe_Ref_Cell.validate_skip(ops, cs, weak) + && t_Maybe_Ref_Cell.validate_skip(ops, cs, weak) + && t_HashmapE_256_SimpleLib.validate_skip(ops, cs, weak); } bool StateInit::unpack(vm::CellSlice& cs, StateInit::Record& data) const { @@ -4199,7 +4204,7 @@ int SimpleLib::check_tag(const vm::CellSlice& cs) const { return simple_lib; } -bool SimpleLib::validate_skip(vm::CellSlice& cs, bool weak) const { +bool SimpleLib::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance_ext(0x10001); } @@ -4269,10 +4274,10 @@ bool Message::skip(vm::CellSlice& cs) const { && Either{X_, RefT{X_}}.skip(cs); } -bool Message::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_CommonMsgInfo.validate_skip(cs, weak) - && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(cs, weak) - && Either{X_, RefT{X_}}.validate_skip(cs, weak); +bool Message::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_CommonMsgInfo.validate_skip(ops, cs, weak) + && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(ops, cs, weak) + && Either{X_, RefT{X_}}.validate_skip(ops, cs, weak); } bool Message::unpack(vm::CellSlice& cs, Message::Record& data) const { @@ -4347,10 +4352,10 @@ bool MessageRelaxed::skip(vm::CellSlice& cs) const { && Either{X_, RefT{X_}}.skip(cs); } -bool MessageRelaxed::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_CommonMsgInfoRelaxed.validate_skip(cs, weak) - && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(cs, weak) - && Either{X_, RefT{X_}}.validate_skip(cs, weak); +bool MessageRelaxed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_CommonMsgInfoRelaxed.validate_skip(ops, cs, weak) + && t_Maybe_Either_StateInit_Ref_StateInit.validate_skip(ops, cs, weak) + && Either{X_, RefT{X_}}.validate_skip(ops, cs, weak); } bool MessageRelaxed::unpack(vm::CellSlice& cs, MessageRelaxed::Record& data) const { @@ -4441,7 +4446,7 @@ bool IntermediateAddress::skip(vm::CellSlice& cs) const { return false; } -bool IntermediateAddress::validate_skip(vm::CellSlice& cs, bool weak) const { +bool IntermediateAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case interm_addr_regular: { int use_dest_bits; @@ -4635,12 +4640,12 @@ bool MsgEnvelope::skip(vm::CellSlice& cs) const { && cs.advance_refs(1); } -bool MsgEnvelope::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgEnvelope::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 4 - && t_IntermediateAddress.validate_skip(cs, weak) - && t_IntermediateAddress.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) - && t_Message_Any.validate_skip_ref(cs, weak); + && t_IntermediateAddress.validate_skip(ops, cs, weak) + && t_IntermediateAddress.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) + && t_Message_Any.validate_skip_ref(ops, cs, weak); } bool MsgEnvelope::unpack(vm::CellSlice& cs, MsgEnvelope::Record& data) const { @@ -4739,43 +4744,43 @@ bool InMsg::skip(vm::CellSlice& cs) const { return false; } -bool InMsg::validate_skip(vm::CellSlice& cs, bool weak) const { +bool InMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case msg_import_ext: return cs.fetch_ulong(3) == 0 - && t_Message_Any.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak); + && t_Message_Any.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak); case msg_import_ihr: return cs.advance(3) - && t_Message_Any.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak) - && t_Grams.validate_skip(cs, weak) + && t_Message_Any.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) && cs.advance_refs(1); case msg_import_imm: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); case msg_import_fin: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); case msg_import_tr: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); case msg_discard_fin: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) && cs.advance(64) - && t_Grams.validate_skip(cs, weak); + && t_Grams.validate_skip(ops, cs, weak); case msg_discard_tr: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) && cs.advance(64) - && t_Grams.validate_skip(cs, weak) + && t_Grams.validate_skip(ops, cs, weak) && cs.advance_refs(1); } return false; @@ -5172,9 +5177,9 @@ bool ImportFees::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool ImportFees::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Grams.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); +bool ImportFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Grams.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ImportFees::unpack(vm::CellSlice& cs, ImportFees::Record& data) const { @@ -5242,8 +5247,8 @@ bool InMsgDescr::skip(vm::CellSlice& cs) const { return t_HashmapAugE_256_InMsg_ImportFees.skip(cs); } -bool InMsgDescr::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_256_InMsg_ImportFees.validate_skip(cs, weak); +bool InMsgDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_256_InMsg_ImportFees.validate_skip(ops, cs, weak); } bool InMsgDescr::unpack(vm::CellSlice& cs, InMsgDescr::Record& data) const { @@ -5338,37 +5343,37 @@ bool OutMsg::skip(vm::CellSlice& cs) const { return false; } -bool OutMsg::validate_skip(vm::CellSlice& cs, bool weak) const { +bool OutMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case msg_export_ext: return cs.advance(3) - && t_Message_Any.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak); + && t_Message_Any.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak); case msg_export_imm: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak) - && t_InMsg.validate_skip_ref(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak) + && t_InMsg.validate_skip_ref(ops, cs, weak); case msg_export_new: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_Transaction.validate_skip_ref(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak); case msg_export_tr: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_InMsg.validate_skip_ref(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_InMsg.validate_skip_ref(ops, cs, weak); case msg_export_deq: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) && cs.advance(64); case msg_export_tr_req: return cs.advance(3) - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_InMsg.validate_skip_ref(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_InMsg.validate_skip_ref(ops, cs, weak); case msg_export_deq_imm: return cs.fetch_ulong(3) == 4 - && t_MsgEnvelope.validate_skip_ref(cs, weak) - && t_InMsg.validate_skip_ref(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak) + && t_InMsg.validate_skip_ref(ops, cs, weak); } return false; } @@ -5772,9 +5777,9 @@ int EnqueuedMsg::check_tag(const vm::CellSlice& cs) const { return cons1; } -bool EnqueuedMsg::validate_skip(vm::CellSlice& cs, bool weak) const { +bool EnqueuedMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(64) - && t_MsgEnvelope.validate_skip_ref(cs, weak); + && t_MsgEnvelope.validate_skip_ref(ops, cs, weak); } bool EnqueuedMsg::unpack(vm::CellSlice& cs, EnqueuedMsg::Record& data) const { @@ -5841,8 +5846,8 @@ bool OutMsgDescr::skip(vm::CellSlice& cs) const { return t_HashmapAugE_256_OutMsg_CurrencyCollection.skip(cs); } -bool OutMsgDescr::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_256_OutMsg_CurrencyCollection.validate_skip(cs, weak); +bool OutMsgDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_256_OutMsg_CurrencyCollection.validate_skip(ops, cs, weak); } bool OutMsgDescr::unpack(vm::CellSlice& cs, OutMsgDescr::Record& data) const { @@ -5904,8 +5909,8 @@ bool OutMsgQueue::skip(vm::CellSlice& cs) const { return t_HashmapAugE_352_EnqueuedMsg_uint64.skip(cs); } -bool OutMsgQueue::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_352_EnqueuedMsg_uint64.validate_skip(cs, weak); +bool OutMsgQueue::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_352_EnqueuedMsg_uint64.validate_skip(ops, cs, weak); } bool OutMsgQueue::unpack(vm::CellSlice& cs, OutMsgQueue::Record& data) const { @@ -6026,8 +6031,8 @@ bool ProcessedInfo::skip(vm::CellSlice& cs) const { return t_HashmapE_96_ProcessedUpto.skip(cs); } -bool ProcessedInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapE_96_ProcessedUpto.validate_skip(cs, weak); +bool ProcessedInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_96_ProcessedUpto.validate_skip(ops, cs, weak); } bool ProcessedInfo::unpack(vm::CellSlice& cs, ProcessedInfo::Record& data) const { @@ -6143,8 +6148,8 @@ bool IhrPendingInfo::skip(vm::CellSlice& cs) const { return t_HashmapE_320_IhrPendingSince.skip(cs); } -bool IhrPendingInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapE_320_IhrPendingSince.validate_skip(cs, weak); +bool IhrPendingInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_320_IhrPendingSince.validate_skip(ops, cs, weak); } bool IhrPendingInfo::unpack(vm::CellSlice& cs, IhrPendingInfo::Record& data) const { @@ -6208,10 +6213,10 @@ bool OutMsgQueueInfo::skip(vm::CellSlice& cs) const { && t_IhrPendingInfo.skip(cs); } -bool OutMsgQueueInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_OutMsgQueue.validate_skip(cs, weak) - && t_ProcessedInfo.validate_skip(cs, weak) - && t_IhrPendingInfo.validate_skip(cs, weak); +bool OutMsgQueueInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_OutMsgQueue.validate_skip(ops, cs, weak) + && t_ProcessedInfo.validate_skip(ops, cs, weak) + && t_IhrPendingInfo.validate_skip(ops, cs, weak); } bool OutMsgQueueInfo::unpack(vm::CellSlice& cs, OutMsgQueueInfo::Record& data) const { @@ -6287,10 +6292,10 @@ bool StorageUsed::skip(vm::CellSlice& cs) const { && t_VarUInteger_7.skip(cs); } -bool StorageUsed::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_7.validate_skip(cs, weak) - && t_VarUInteger_7.validate_skip(cs, weak) - && t_VarUInteger_7.validate_skip(cs, weak); +bool StorageUsed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_7.validate_skip(ops, cs, weak) + && t_VarUInteger_7.validate_skip(ops, cs, weak) + && t_VarUInteger_7.validate_skip(ops, cs, weak); } bool StorageUsed::unpack(vm::CellSlice& cs, StorageUsed::Record& data) const { @@ -6365,9 +6370,9 @@ bool StorageUsedShort::skip(vm::CellSlice& cs) const { && t_VarUInteger_7.skip(cs); } -bool StorageUsedShort::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_7.validate_skip(cs, weak) - && t_VarUInteger_7.validate_skip(cs, weak); +bool StorageUsedShort::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_7.validate_skip(ops, cs, weak) + && t_VarUInteger_7.validate_skip(ops, cs, weak); } bool StorageUsedShort::unpack(vm::CellSlice& cs, StorageUsedShort::Record& data) const { @@ -6437,10 +6442,10 @@ bool StorageInfo::skip(vm::CellSlice& cs) const { && t_Maybe_Grams.skip(cs); } -bool StorageInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_StorageUsed.validate_skip(cs, weak) +bool StorageInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_StorageUsed.validate_skip(ops, cs, weak) && cs.advance(32) - && t_Maybe_Grams.validate_skip(cs, weak); + && t_Maybe_Grams.validate_skip(ops, cs, weak); } bool StorageInfo::unpack(vm::CellSlice& cs, StorageInfo::Record& data) const { @@ -6528,15 +6533,15 @@ bool Account::skip(vm::CellSlice& cs) const { return false; } -bool Account::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Account::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case account_none: return cs.advance(1); case account: return cs.advance(1) - && t_MsgAddressInt.validate_skip(cs, weak) - && t_StorageInfo.validate_skip(cs, weak) - && t_AccountStorage.validate_skip(cs, weak); + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && t_StorageInfo.validate_skip(ops, cs, weak) + && t_AccountStorage.validate_skip(ops, cs, weak); } return false; } @@ -6664,10 +6669,10 @@ bool AccountStorage::skip(vm::CellSlice& cs) const { && t_AccountState.skip(cs); } -bool AccountStorage::validate_skip(vm::CellSlice& cs, bool weak) const { +bool AccountStorage::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(64) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_AccountState.validate_skip(cs, weak); + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_AccountState.validate_skip(ops, cs, weak); } bool AccountStorage::unpack(vm::CellSlice& cs, AccountStorage::Record& data) const { @@ -6759,13 +6764,13 @@ bool AccountState::skip(vm::CellSlice& cs) const { return false; } -bool AccountState::validate_skip(vm::CellSlice& cs, bool weak) const { +bool AccountState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case account_uninit: return cs.advance(2); case account_active: return cs.advance(1) - && t_StateInit.validate_skip(cs, weak); + && t_StateInit.validate_skip(ops, cs, weak); case account_frozen: return cs.advance(258); } @@ -7123,8 +7128,8 @@ int ShardAccount::check_tag(const vm::CellSlice& cs) const { return account_descr; } -bool ShardAccount::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Account.validate_skip_ref(cs, weak) +bool ShardAccount::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Account.validate_skip_ref(ops, cs, weak) && cs.advance(320); } @@ -7198,10 +7203,10 @@ bool DepthBalanceInfo::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool DepthBalanceInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool DepthBalanceInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int split_depth; return cs.fetch_uint_leq(30, split_depth) - && t_CurrencyCollection.validate_skip(cs, weak); + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool DepthBalanceInfo::unpack(vm::CellSlice& cs, DepthBalanceInfo::Record& data) const { @@ -7270,8 +7275,8 @@ bool ShardAccounts::skip(vm::CellSlice& cs) const { return t_HashmapAugE_256_ShardAccount_DepthBalanceInfo.skip(cs); } -bool ShardAccounts::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_256_ShardAccount_DepthBalanceInfo.validate_skip(cs, weak); +bool ShardAccounts::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_256_ShardAccount_DepthBalanceInfo.validate_skip(ops, cs, weak); } bool ShardAccounts::unpack(vm::CellSlice& cs, ShardAccounts::Record& data) const { @@ -7334,9 +7339,9 @@ bool Transaction_aux::skip(vm::CellSlice& cs) const { && t_HashmapE_15_Ref_Message_Any.skip(cs); } -bool Transaction_aux::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Maybe_Ref_Message_Any.validate_skip(cs, weak) - && t_HashmapE_15_Ref_Message_Any.validate_skip(cs, weak); +bool Transaction_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Maybe_Ref_Message_Any.validate_skip(ops, cs, weak) + && t_HashmapE_15_Ref_Message_Any.validate_skip(ops, cs, weak); } bool Transaction_aux::unpack(vm::CellSlice& cs, Transaction_aux::Record& data) const { @@ -7407,13 +7412,13 @@ bool Transaction::skip(vm::CellSlice& cs) const { && cs.advance_refs(2); } -bool Transaction::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Transaction::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 7 && cs.advance(691) - && t_Transaction_aux.validate_skip_ref(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_HASH_UPDATE_Account.validate_skip_ref(cs, weak) - && t_TransactionDescr.validate_skip_ref(cs, weak); + && t_Transaction_aux.validate_skip_ref(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_HASH_UPDATE_Account.validate_skip_ref(ops, cs, weak) + && t_TransactionDescr.validate_skip_ref(ops, cs, weak); } bool Transaction::unpack(vm::CellSlice& cs, Transaction::Record& data) const { @@ -7496,11 +7501,11 @@ int MERKLE_UPDATE::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 2 ? _merkle_update : -1; } -bool MERKLE_UPDATE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MERKLE_UPDATE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 2 && cs.advance(512) - && X_.validate_skip_ref(cs, weak) - && X_.validate_skip_ref(cs, weak); + && X_.validate_skip_ref(ops, cs, weak) + && X_.validate_skip_ref(ops, cs, weak); } bool MERKLE_UPDATE::unpack(vm::CellSlice& cs, MERKLE_UPDATE::Record& data) const { @@ -7552,7 +7557,7 @@ int HASH_UPDATE::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0x72 ? update_hashes : -1; } -bool HASH_UPDATE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HASH_UPDATE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0x72 && cs.advance(512); } @@ -7627,11 +7632,11 @@ bool AccountBlock::skip(vm::CellSlice& cs) const { && cs.advance_refs(1); } -bool AccountBlock::validate_skip(vm::CellSlice& cs, bool weak) const { +bool AccountBlock::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 5 && cs.advance(256) - && t_HashmapAug_64_Ref_Transaction_CurrencyCollection.validate_skip(cs, weak) - && t_HASH_UPDATE_Account.validate_skip_ref(cs, weak); + && t_HashmapAug_64_Ref_Transaction_CurrencyCollection.validate_skip(ops, cs, weak) + && t_HASH_UPDATE_Account.validate_skip_ref(ops, cs, weak); } bool AccountBlock::unpack(vm::CellSlice& cs, AccountBlock::Record& data) const { @@ -7709,8 +7714,8 @@ bool ShardAccountBlocks::skip(vm::CellSlice& cs) const { return t_HashmapAugE_256_AccountBlock_CurrencyCollection.skip(cs); } -bool ShardAccountBlocks::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_256_AccountBlock_CurrencyCollection.validate_skip(cs, weak); +bool ShardAccountBlocks::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_256_AccountBlock_CurrencyCollection.validate_skip(ops, cs, weak); } bool ShardAccountBlocks::unpack(vm::CellSlice& cs, ShardAccountBlocks::Record& data) const { @@ -7774,10 +7779,10 @@ bool TrStoragePhase::skip(vm::CellSlice& cs) const { && t_AccStatusChange.skip(cs); } -bool TrStoragePhase::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Grams.validate_skip(cs, weak) - && t_Maybe_Grams.validate_skip(cs, weak) - && t_AccStatusChange.validate_skip(cs, weak); +bool TrStoragePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Grams.validate_skip(ops, cs, weak) + && t_Maybe_Grams.validate_skip(ops, cs, weak) + && t_AccStatusChange.validate_skip(ops, cs, weak); } bool TrStoragePhase::unpack(vm::CellSlice& cs, TrStoragePhase::Record& data) const { @@ -7869,7 +7874,7 @@ bool AccStatusChange::skip(vm::CellSlice& cs) const { return false; } -bool AccStatusChange::validate_skip(vm::CellSlice& cs, bool weak) const { +bool AccStatusChange::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case acst_unchanged: return cs.advance(1); @@ -8035,9 +8040,9 @@ bool TrCreditPhase::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool TrCreditPhase::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Maybe_Grams.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); +bool TrCreditPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Maybe_Grams.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool TrCreditPhase::unpack(vm::CellSlice& cs, TrCreditPhase::Record& data) const { @@ -8110,12 +8115,12 @@ bool TrComputePhase_aux::skip(vm::CellSlice& cs) const { && cs.advance(544); } -bool TrComputePhase_aux::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_7.validate_skip(cs, weak) - && t_VarUInteger_7.validate_skip(cs, weak) - && t_Maybe_VarUInteger_3.validate_skip(cs, weak) +bool TrComputePhase_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_7.validate_skip(ops, cs, weak) + && t_VarUInteger_7.validate_skip(ops, cs, weak) + && t_Maybe_VarUInteger_3.validate_skip(ops, cs, weak) && cs.advance(40) - && t_Maybe_int32.validate_skip(cs, weak) + && t_Maybe_int32.validate_skip(ops, cs, weak) && cs.advance(544); } @@ -8200,15 +8205,15 @@ bool TrComputePhase::skip(vm::CellSlice& cs) const { return false; } -bool TrComputePhase::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TrComputePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case tr_phase_compute_skipped: return cs.advance(1) - && t_ComputeSkipReason.validate_skip(cs, weak); + && t_ComputeSkipReason.validate_skip(ops, cs, weak); case tr_phase_compute_vm: return cs.advance(4) - && t_Grams.validate_skip(cs, weak) - && t_TrComputePhase_aux.validate_skip_ref(cs, weak); + && t_Grams.validate_skip(ops, cs, weak) + && t_TrComputePhase_aux.validate_skip_ref(ops, cs, weak); } return false; } @@ -8327,7 +8332,7 @@ int ComputeSkipReason::check_tag(const vm::CellSlice& cs) const { return -1; } -bool ComputeSkipReason::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ComputeSkipReason::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case cskip_no_state: return cs.advance(2); @@ -8499,15 +8504,15 @@ bool TrActionPhase::skip(vm::CellSlice& cs) const { && t_StorageUsedShort.skip(cs); } -bool TrActionPhase::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TrActionPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(3) - && t_AccStatusChange.validate_skip(cs, weak) - && t_Maybe_Grams.validate_skip(cs, weak) - && t_Maybe_Grams.validate_skip(cs, weak) + && t_AccStatusChange.validate_skip(ops, cs, weak) + && t_Maybe_Grams.validate_skip(ops, cs, weak) + && t_Maybe_Grams.validate_skip(ops, cs, weak) && cs.advance(32) - && t_Maybe_int32.validate_skip(cs, weak) + && t_Maybe_int32.validate_skip(ops, cs, weak) && cs.advance(320) - && t_StorageUsedShort.validate_skip(cs, weak); + && t_StorageUsedShort.validate_skip(ops, cs, weak); } bool TrActionPhase::unpack(vm::CellSlice& cs, TrActionPhase::Record& data) const { @@ -8616,19 +8621,19 @@ bool TrBouncePhase::skip(vm::CellSlice& cs) const { return false; } -bool TrBouncePhase::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TrBouncePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case tr_phase_bounce_negfunds: return cs.advance(2); case tr_phase_bounce_nofunds: return cs.advance(2) - && t_StorageUsedShort.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_StorageUsedShort.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); case tr_phase_bounce_ok: return cs.advance(1) - && t_StorageUsedShort.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_StorageUsedShort.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); } return false; } @@ -8912,48 +8917,48 @@ bool TransactionDescr::skip(vm::CellSlice& cs) const { return false; } -bool TransactionDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TransactionDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case trans_ord: return cs.advance(5) - && t_Maybe_TrStoragePhase.validate_skip(cs, weak) - && t_Maybe_TrCreditPhase.validate_skip(cs, weak) - && t_TrComputePhase.validate_skip(cs, weak) - && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak) + && t_Maybe_TrStoragePhase.validate_skip(ops, cs, weak) + && t_Maybe_TrCreditPhase.validate_skip(ops, cs, weak) + && t_TrComputePhase.validate_skip(ops, cs, weak) + && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak) && cs.advance(1) - && t_Maybe_TrBouncePhase.validate_skip(cs, weak) + && t_Maybe_TrBouncePhase.validate_skip(ops, cs, weak) && cs.advance(1); case trans_storage: return cs.advance(4) - && t_TrStoragePhase.validate_skip(cs, weak); + && t_TrStoragePhase.validate_skip(ops, cs, weak); case trans_tick_tock: return cs.advance(4) - && t_TrStoragePhase.validate_skip(cs, weak) - && t_TrComputePhase.validate_skip(cs, weak) - && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak) + && t_TrStoragePhase.validate_skip(ops, cs, weak) + && t_TrComputePhase.validate_skip(ops, cs, weak) + && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak) && cs.advance(2); case trans_split_prepare: return cs.advance(528) - && t_Maybe_TrStoragePhase.validate_skip(cs, weak) - && t_TrComputePhase.validate_skip(cs, weak) - && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak) + && t_Maybe_TrStoragePhase.validate_skip(ops, cs, weak) + && t_TrComputePhase.validate_skip(ops, cs, weak) + && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak) && cs.advance(2); case trans_split_install: return cs.advance(528) - && t_Transaction.validate_skip_ref(cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak) && cs.advance(1); case trans_merge_prepare: return cs.advance(528) - && t_TrStoragePhase.validate_skip(cs, weak) + && t_TrStoragePhase.validate_skip(ops, cs, weak) && cs.advance(1); case trans_merge_install: return cs.fetch_ulong(4) == 7 && cs.advance(524) - && t_Transaction.validate_skip_ref(cs, weak) - && t_Maybe_TrStoragePhase.validate_skip(cs, weak) - && t_Maybe_TrCreditPhase.validate_skip(cs, weak) - && t_TrComputePhase.validate_skip(cs, weak) - && t_Maybe_Ref_TrActionPhase.validate_skip(cs, weak) + && t_Transaction.validate_skip_ref(ops, cs, weak) + && t_Maybe_TrStoragePhase.validate_skip(ops, cs, weak) + && t_Maybe_TrCreditPhase.validate_skip(ops, cs, weak) + && t_TrComputePhase.validate_skip(ops, cs, weak) + && t_Maybe_Ref_TrActionPhase.validate_skip(ops, cs, weak) && cs.advance(2); } return false; @@ -9342,11 +9347,11 @@ bool SmartContractInfo::skip(vm::CellSlice& cs) const { && t_MsgAddressInt.skip(cs); } -bool SmartContractInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool SmartContractInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0x76ef1ea && cs.advance(448) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_MsgAddressInt.validate_skip(cs, weak); + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_MsgAddressInt.validate_skip(ops, cs, weak); } bool SmartContractInfo::unpack(vm::CellSlice& cs, SmartContractInfo::Record& data) const { @@ -9435,15 +9440,15 @@ bool OutList::skip(vm::CellSlice& cs) const { return false; } -bool OutList::validate_skip(vm::CellSlice& cs, bool weak) const { +bool OutList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case out_list_empty: return m_ == 0; case out_list: { int n; return add_r1(n, 1, m_) - && OutList{n}.validate_skip_ref(cs, weak) - && t_OutAction.validate_skip(cs, weak); + && OutList{n}.validate_skip_ref(ops, cs, weak) + && t_OutAction.validate_skip(ops, cs, weak); } } return false; @@ -9555,10 +9560,147 @@ bool OutList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { } +// +// code for type `LibRef` +// + +int LibRef::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case libref_hash: + return cs.have(1) ? libref_hash : -1; + case libref_ref: + return cs.have(1) ? libref_ref : -1; + } + return -1; +} + +bool LibRef::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case libref_hash: + return cs.advance(257); + case libref_ref: + return cs.advance_ext(0x10001); + } + return false; +} + +bool LibRef::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case libref_hash: + return cs.advance(257); + case libref_ref: + return cs.advance_ext(0x10001); + } + return false; +} + +bool LibRef::unpack(vm::CellSlice& cs, LibRef::Record_libref_hash& data) const { + return cs.fetch_ulong(1) == 0 + && cs.fetch_bits_to(data.lib_hash.bits(), 256); +} + +bool LibRef::unpack_libref_hash(vm::CellSlice& cs, td::BitArray<256>& lib_hash) const { + return cs.fetch_ulong(1) == 0 + && cs.fetch_bits_to(lib_hash.bits(), 256); +} + +bool LibRef::cell_unpack(Ref cell_ref, LibRef::Record_libref_hash& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool LibRef::cell_unpack_libref_hash(Ref cell_ref, td::BitArray<256>& lib_hash) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_libref_hash(cs, lib_hash) && cs.empty_ext(); +} + +bool LibRef::unpack(vm::CellSlice& cs, LibRef::Record_libref_ref& data) const { + return cs.fetch_ulong(1) == 1 + && cs.fetch_ref_to(data.library); +} + +bool LibRef::unpack_libref_ref(vm::CellSlice& cs, Ref& library) const { + return cs.fetch_ulong(1) == 1 + && cs.fetch_ref_to(library); +} + +bool LibRef::cell_unpack(Ref cell_ref, LibRef::Record_libref_ref& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool LibRef::cell_unpack_libref_ref(Ref cell_ref, Ref& library) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_libref_ref(cs, library) && cs.empty_ext(); +} + +bool LibRef::pack(vm::CellBuilder& cb, const LibRef::Record_libref_hash& data) const { + return cb.store_long_bool(0, 1) + && cb.store_bits_bool(data.lib_hash.cbits(), 256); +} + +bool LibRef::pack_libref_hash(vm::CellBuilder& cb, td::BitArray<256> lib_hash) const { + return cb.store_long_bool(0, 1) + && cb.store_bits_bool(lib_hash.cbits(), 256); +} + +bool LibRef::cell_pack(Ref& cell_ref, const LibRef::Record_libref_hash& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool LibRef::cell_pack_libref_hash(Ref& cell_ref, td::BitArray<256> lib_hash) const { + vm::CellBuilder cb; + return pack_libref_hash(cb, lib_hash) && std::move(cb).finalize_to(cell_ref); +} + +bool LibRef::pack(vm::CellBuilder& cb, const LibRef::Record_libref_ref& data) const { + return cb.store_long_bool(1, 1) + && cb.store_ref_bool(data.library); +} + +bool LibRef::pack_libref_ref(vm::CellBuilder& cb, Ref library) const { + return cb.store_long_bool(1, 1) + && cb.store_ref_bool(library); +} + +bool LibRef::cell_pack(Ref& cell_ref, const LibRef::Record_libref_ref& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool LibRef::cell_pack_libref_ref(Ref& cell_ref, Ref library) const { + vm::CellBuilder cb; + return pack_libref_ref(cb, std::move(library)) && std::move(cb).finalize_to(cell_ref); +} + +bool LibRef::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case libref_hash: + return cs.advance(1) + && pp.open("libref_hash") + && pp.fetch_bits_field(cs, 256, "lib_hash") + && pp.close(); + case libref_ref: + return cs.advance(1) + && pp.open("libref_ref") + && pp.field("library") + && t_Anything.print_ref(pp, cs.fetch_ref()) + && pp.close(); + } + return pp.fail("unknown constructor for LibRef"); +} + +const LibRef t_LibRef; + // // code for type `OutAction` // -constexpr unsigned OutAction::cons_tag[3]; +constexpr unsigned OutAction::cons_tag[4]; int OutAction::check_tag(const vm::CellSlice& cs) const { switch (get_tag(cs)) { @@ -9568,6 +9710,8 @@ int OutAction::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(32) == 0xad4de08eU ? action_set_code : -1; case action_reserve_currency: return cs.prefetch_ulong(32) == 0x36e6b809 ? action_reserve_currency : -1; + case action_change_library: + return cs.prefetch_ulong(32) == 0x26fa1dd4 ? action_change_library : -1; } return -1; } @@ -9581,23 +9725,37 @@ bool OutAction::skip(vm::CellSlice& cs) const { case action_reserve_currency: return cs.advance(40) && t_CurrencyCollection.skip(cs); + case action_change_library: { + int mode; + return cs.advance(32) + && cs.fetch_uint_to(7, mode) + && mode <= 2 + && t_LibRef.skip(cs); + } } return false; } -bool OutAction::validate_skip(vm::CellSlice& cs, bool weak) const { +bool OutAction::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case action_send_msg: return cs.fetch_ulong(32) == 0xec3c86d && cs.advance(8) - && t_MessageRelaxed_Any.validate_skip_ref(cs, weak); + && t_MessageRelaxed_Any.validate_skip_ref(ops, cs, weak); case action_set_code: return cs.fetch_ulong(32) == 0xad4de08eU && cs.advance_refs(1); case action_reserve_currency: return cs.fetch_ulong(32) == 0x36e6b809 && cs.advance(8) - && t_CurrencyCollection.validate_skip(cs, weak); + && t_CurrencyCollection.validate_skip(ops, cs, weak); + case action_change_library: { + int mode; + return cs.fetch_ulong(32) == 0x26fa1dd4 + && cs.fetch_uint_to(7, mode) + && mode <= 2 + && t_LibRef.validate_skip(ops, cs, weak); + } } return false; } @@ -9672,6 +9830,32 @@ bool OutAction::cell_unpack_action_reserve_currency(Ref cell_ref, int& return unpack_action_reserve_currency(cs, mode, currency) && cs.empty_ext(); } +bool OutAction::unpack(vm::CellSlice& cs, OutAction::Record_action_change_library& data) const { + return cs.fetch_ulong(32) == 0x26fa1dd4 + && cs.fetch_uint_to(7, data.mode) + && data.mode <= 2 + && t_LibRef.fetch_to(cs, data.libref); +} + +bool OutAction::unpack_action_change_library(vm::CellSlice& cs, int& mode, Ref& libref) const { + return cs.fetch_ulong(32) == 0x26fa1dd4 + && cs.fetch_uint_to(7, mode) + && mode <= 2 + && t_LibRef.fetch_to(cs, libref); +} + +bool OutAction::cell_unpack(Ref cell_ref, OutAction::Record_action_change_library& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool OutAction::cell_unpack_action_change_library(Ref cell_ref, int& mode, Ref& libref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_action_change_library(cs, mode, libref) && cs.empty_ext(); +} + bool OutAction::pack(vm::CellBuilder& cb, const OutAction::Record_action_send_msg& data) const { return cb.store_long_bool(0xec3c86d, 32) && cb.store_ulong_rchk_bool(data.mode, 8) @@ -9736,6 +9920,30 @@ bool OutAction::cell_pack_action_reserve_currency(Ref& cell_ref, int m return pack_action_reserve_currency(cb, mode, std::move(currency)) && std::move(cb).finalize_to(cell_ref); } +bool OutAction::pack(vm::CellBuilder& cb, const OutAction::Record_action_change_library& data) const { + return cb.store_long_bool(0x26fa1dd4, 32) + && cb.store_ulong_rchk_bool(data.mode, 7) + && data.mode <= 2 + && t_LibRef.store_from(cb, data.libref); +} + +bool OutAction::pack_action_change_library(vm::CellBuilder& cb, int mode, Ref libref) const { + return cb.store_long_bool(0x26fa1dd4, 32) + && cb.store_ulong_rchk_bool(mode, 7) + && mode <= 2 + && t_LibRef.store_from(cb, libref); +} + +bool OutAction::cell_pack(Ref& cell_ref, const OutAction::Record_action_change_library& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool OutAction::cell_pack_action_change_library(Ref& cell_ref, int mode, Ref libref) const { + vm::CellBuilder cb; + return pack_action_change_library(cb, mode, std::move(libref)) && std::move(cb).finalize_to(cell_ref); +} + bool OutAction::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { switch (get_tag(cs)) { case action_send_msg: { @@ -9764,6 +9972,17 @@ bool OutAction::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { && t_CurrencyCollection.print_skip(pp, cs) && pp.close(); } + case action_change_library: { + int mode; + return cs.fetch_ulong(32) == 0x26fa1dd4 + && pp.open("action_change_library") + && cs.fetch_uint_to(7, mode) + && pp.field_int(mode, "mode") + && mode <= 2 + && pp.field("libref") + && t_LibRef.print_skip(pp, cs) + && pp.close(); + } } return pp.fail("unknown constructor for OutAction"); } @@ -9783,9 +10002,9 @@ bool OutListNode::skip(vm::CellSlice& cs) const { && t_OutAction.skip(cs); } -bool OutListNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool OutListNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance_refs(1) - && t_OutAction.validate_skip(cs, weak); + && t_OutAction.validate_skip(ops, cs, weak); } bool OutListNode::unpack(vm::CellSlice& cs, OutListNode::Record& data) const { @@ -9849,7 +10068,7 @@ int ShardIdent::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(2) == 0 ? shard_ident : -1; } -bool ShardIdent::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardIdent::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int shard_pfx_bits; return cs.fetch_ulong(2) == 0 && cs.fetch_uint_leq(60, shard_pfx_bits) @@ -9971,8 +10190,8 @@ int BlockIdExt::check_tag(const vm::CellSlice& cs) const { return block_id_ext; } -bool BlockIdExt::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_ShardIdent.validate_skip(cs, weak) +bool BlockIdExt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_ShardIdent.validate_skip(ops, cs, weak) && cs.advance(544); } @@ -10084,12 +10303,12 @@ bool ShardStateUnsplit_aux::skip(vm::CellSlice& cs) const { && t_Maybe_BlkMasterInfo.skip(cs); } -bool ShardStateUnsplit_aux::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardStateUnsplit_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(128) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_HashmapE_256_LibDescr.validate_skip(cs, weak) - && t_Maybe_BlkMasterInfo.validate_skip(cs, weak); + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_HashmapE_256_LibDescr.validate_skip(ops, cs, weak) + && t_Maybe_BlkMasterInfo.validate_skip(ops, cs, weak); } bool ShardStateUnsplit_aux::unpack(vm::CellSlice& cs, ShardStateUnsplit_aux::Record& data) const { @@ -10152,16 +10371,16 @@ bool ShardStateUnsplit::skip(vm::CellSlice& cs) const { && t_Maybe_Ref_McStateExtra.skip(cs); } -bool ShardStateUnsplit::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardStateUnsplit::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0x9023afe2U && cs.advance(32) - && t_ShardIdent.validate_skip(cs, weak) + && t_ShardIdent.validate_skip(ops, cs, weak) && cs.advance(192) - && t_OutMsgQueueInfo.validate_skip_ref(cs, weak) + && t_OutMsgQueueInfo.validate_skip_ref(ops, cs, weak) && cs.advance(1) - && t_ShardAccounts.validate_skip_ref(cs, weak) - && t_ShardStateUnsplit_aux.validate_skip_ref(cs, weak) - && t_Maybe_Ref_McStateExtra.validate_skip(cs, weak); + && t_ShardAccounts.validate_skip_ref(ops, cs, weak) + && t_ShardStateUnsplit_aux.validate_skip_ref(ops, cs, weak) + && t_Maybe_Ref_McStateExtra.validate_skip(ops, cs, weak); } bool ShardStateUnsplit::unpack(vm::CellSlice& cs, ShardStateUnsplit::Record& data) const { @@ -10263,14 +10482,14 @@ bool ShardState::skip(vm::CellSlice& cs) const { return false; } -bool ShardState::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case cons1: - return t_ShardStateUnsplit.validate_skip(cs, weak); + return t_ShardStateUnsplit.validate_skip(ops, cs, weak); case split_state: return cs.fetch_ulong(32) == 0x5f327da5 - && t_ShardStateUnsplit.validate_skip_ref(cs, weak) - && t_ShardStateUnsplit.validate_skip_ref(cs, weak); + && t_ShardStateUnsplit.validate_skip_ref(ops, cs, weak) + && t_ShardStateUnsplit.validate_skip_ref(ops, cs, weak); } return false; } @@ -10393,10 +10612,10 @@ bool LibDescr::skip(vm::CellSlice& cs) const { && t_Hashmap_256_True.skip(cs); } -bool LibDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool LibDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(2) == 0 && cs.advance_refs(1) - && t_Hashmap_256_True.validate_skip(cs, weak); + && t_Hashmap_256_True.validate_skip(ops, cs, weak); } bool LibDescr::unpack(vm::CellSlice& cs, LibDescr::Record& data) const { @@ -10484,7 +10703,7 @@ bool BlockInfo::skip(vm::CellSlice& cs) const { && (!vert_seqno_incr || cs.advance_refs(1)); } -bool BlockInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int not_master, after_merge, vert_seqno_incr, seq_no, vert_seq_no, prev_seq_no; return cs.fetch_ulong(32) == 0x9bc7a987U && cs.advance(32) @@ -10497,11 +10716,11 @@ bool BlockInfo::validate_skip(vm::CellSlice& cs, bool weak) const { && cs.fetch_uint_to(32, vert_seq_no) && vert_seqno_incr <= vert_seq_no && add_r1(prev_seq_no, 1, seq_no) - && t_ShardIdent.validate_skip(cs, weak) + && t_ShardIdent.validate_skip(ops, cs, weak) && cs.advance(288) - && (!not_master || t_BlkMasterInfo.validate_skip_ref(cs, weak)) - && BlkPrevInfo{after_merge}.validate_skip_ref(cs, weak) - && (!vert_seqno_incr || t_BlkPrevInfo_0.validate_skip_ref(cs, weak)); + && (!not_master || t_BlkMasterInfo.validate_skip_ref(ops, cs, weak)) + && BlkPrevInfo{after_merge}.validate_skip_ref(ops, cs, weak) + && (!vert_seqno_incr || t_BlkPrevInfo_0.validate_skip_ref(ops, cs, weak)); } bool BlockInfo::unpack(vm::CellSlice& cs, BlockInfo::Record& data) const { @@ -10656,14 +10875,14 @@ bool BlkPrevInfo::skip(vm::CellSlice& cs) const { return false; } -bool BlkPrevInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlkPrevInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case prev_blk_info: return cs.advance(608) && m_ == 0; case prev_blks_info: - return t_ExtBlkRef.validate_skip_ref(cs, weak) - && t_ExtBlkRef.validate_skip_ref(cs, weak) + return t_ExtBlkRef.validate_skip_ref(ops, cs, weak) + && t_ExtBlkRef.validate_skip_ref(ops, cs, weak) && m_ == 1; } return false; @@ -10787,13 +11006,13 @@ int Block::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(32) == 0x11ef55aa ? block : -1; } -bool Block::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Block::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0x11ef55aa && cs.advance(32) - && t_BlockInfo.validate_skip_ref(cs, weak) - && t_ValueFlow.validate_skip_ref(cs, weak) - && t_MERKLE_UPDATE_ShardState.validate_skip_ref(cs, weak) - && t_BlockExtra.validate_skip_ref(cs, weak); + && t_BlockInfo.validate_skip_ref(ops, cs, weak) + && t_ValueFlow.validate_skip_ref(ops, cs, weak) + && t_MERKLE_UPDATE_ShardState.validate_skip_ref(ops, cs, weak) + && t_BlockExtra.validate_skip_ref(ops, cs, weak); } bool Block::unpack(vm::CellSlice& cs, Block::Record& data) const { @@ -10856,13 +11075,13 @@ bool BlockExtra::skip(vm::CellSlice& cs) const { && t_Maybe_Ref_McBlockExtra.skip(cs); } -bool BlockExtra::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0x4a33f6fd - && t_InMsgDescr.validate_skip_ref(cs, weak) - && t_OutMsgDescr.validate_skip_ref(cs, weak) - && t_ShardAccountBlocks.validate_skip_ref(cs, weak) + && t_InMsgDescr.validate_skip_ref(ops, cs, weak) + && t_OutMsgDescr.validate_skip_ref(ops, cs, weak) + && t_ShardAccountBlocks.validate_skip_ref(ops, cs, weak) && cs.advance(512) - && t_Maybe_Ref_McBlockExtra.validate_skip(cs, weak); + && t_Maybe_Ref_McBlockExtra.validate_skip(ops, cs, weak); } bool BlockExtra::unpack(vm::CellSlice& cs, BlockExtra::Record& data) const { @@ -10929,11 +11148,11 @@ bool ValueFlow_aux::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool ValueFlow_aux::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); +bool ValueFlow_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ValueFlow_aux::unpack(vm::CellSlice& cs, ValueFlow_aux::Record& data) const { @@ -10991,11 +11210,11 @@ bool ValueFlow_aux1::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool ValueFlow_aux1::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); +bool ValueFlow_aux1::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ValueFlow_aux1::unpack(vm::CellSlice& cs, ValueFlow_aux1::Record& data) const { @@ -11053,11 +11272,11 @@ bool ValueFlow::skip(vm::CellSlice& cs) const { && cs.advance_refs(1); } -bool ValueFlow::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ValueFlow::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0xb8e48dfbU - && t_ValueFlow_aux.validate_skip_ref(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_ValueFlow_aux1.validate_skip_ref(cs, weak); + && t_ValueFlow_aux.validate_skip_ref(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_ValueFlow_aux1.validate_skip_ref(ops, cs, weak); } bool ValueFlow::unpack(vm::CellSlice& cs, ValueFlow::Record& data) const { @@ -11127,15 +11346,15 @@ bool BinTree::skip(vm::CellSlice& cs) const { return false; } -bool BinTree::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BinTree::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case bt_leaf: return cs.advance(1) - && X_.validate_skip(cs, weak); + && X_.validate_skip(ops, cs, weak); case bt_fork: return cs.advance(1) - && validate_skip_ref(cs, weak) - && validate_skip_ref(cs, weak); + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak); } return false; } @@ -11279,7 +11498,7 @@ bool FutureSplitMerge::skip(vm::CellSlice& cs) const { return false; } -bool FutureSplitMerge::validate_skip(vm::CellSlice& cs, bool weak) const { +bool FutureSplitMerge::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case fsm_none: return cs.advance(1); @@ -11464,16 +11683,16 @@ bool ShardDescr::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool ShardDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int flags; return cs.fetch_ulong(4) == 11 && cs.advance(709) && cs.fetch_uint_to(3, flags) && flags == 0 && cs.advance(160) - && t_FutureSplitMerge.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); + && t_FutureSplitMerge.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ShardDescr::unpack(vm::CellSlice& cs, ShardDescr::Record& data) const { @@ -11580,8 +11799,8 @@ bool ShardHashes::skip(vm::CellSlice& cs) const { return t_HashmapE_32_Ref_BinTree_ShardDescr.skip(cs); } -bool ShardHashes::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapE_32_Ref_BinTree_ShardDescr.validate_skip(cs, weak); +bool ShardHashes::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_32_Ref_BinTree_ShardDescr.validate_skip(ops, cs, weak); } bool ShardHashes::unpack(vm::CellSlice& cs, ShardHashes::Record& data) const { @@ -11658,17 +11877,17 @@ bool BinTreeAug::skip(vm::CellSlice& cs) const { return false; } -bool BinTreeAug::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BinTreeAug::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case bta_leaf: return cs.advance(1) - && Y_.validate_skip(cs, weak) - && X_.validate_skip(cs, weak); + && Y_.validate_skip(ops, cs, weak) + && X_.validate_skip(ops, cs, weak); case bta_fork: return cs.advance(1) - && validate_skip_ref(cs, weak) - && validate_skip_ref(cs, weak) - && Y_.validate_skip(cs, weak); + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak) + && Y_.validate_skip(ops, cs, weak); } return false; } @@ -11807,9 +12026,9 @@ bool ShardFeeCreated::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool ShardFeeCreated::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_CurrencyCollection.validate_skip(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); +bool ShardFeeCreated::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_CurrencyCollection.validate_skip(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ShardFeeCreated::unpack(vm::CellSlice& cs, ShardFeeCreated::Record& data) const { @@ -11877,8 +12096,8 @@ bool ShardFees::skip(vm::CellSlice& cs) const { return t_HashmapAugE_96_ShardFeeCreated_ShardFeeCreated.skip(cs); } -bool ShardFees::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_96_ShardFeeCreated_ShardFeeCreated.validate_skip(cs, weak); +bool ShardFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_96_ShardFeeCreated_ShardFeeCreated.validate_skip(ops, cs, weak); } bool ShardFees::unpack(vm::CellSlice& cs, ShardFees::Record& data) const { @@ -11936,9 +12155,9 @@ int ConfigParams::check_tag(const vm::CellSlice& cs) const { return cons1; } -bool ConfigParams::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ConfigParams::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(256) - && t_Hashmap_32_Ref_Cell.validate_skip_ref(cs, weak); + && t_Hashmap_32_Ref_Cell.validate_skip_ref(ops, cs, weak); } bool ConfigParams::unpack(vm::CellSlice& cs, ConfigParams::Record& data) const { @@ -12247,8 +12466,8 @@ bool OldMcBlocksInfo::skip(vm::CellSlice& cs) const { return t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt.skip(cs); } -bool OldMcBlocksInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt.validate_skip(cs, weak); +bool OldMcBlocksInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt.validate_skip(ops, cs, weak); } bool OldMcBlocksInfo::unpack(vm::CellSlice& cs, OldMcBlocksInfo::Record& data) const { @@ -12351,7 +12570,7 @@ int CreatorStats::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(4) == 4 ? creator_info : -1; } -bool CreatorStats::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CreatorStats::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 4 && cs.advance(448); } @@ -12417,23 +12636,43 @@ const CreatorStats t_CreatorStats; // // code for type `BlockCreateStats` // -constexpr unsigned char BlockCreateStats::cons_tag[1]; +constexpr unsigned char BlockCreateStats::cons_tag[2]; int BlockCreateStats::check_tag(const vm::CellSlice& cs) const { - return cs.prefetch_ulong(8) == 23 ? block_create_stats : -1; + switch (get_tag(cs)) { + case block_create_stats: + return cs.prefetch_ulong(8) == 23 ? block_create_stats : -1; + case block_create_stats_ext: + return cs.prefetch_ulong(8) == 0x34 ? block_create_stats_ext : -1; + } + return -1; } bool BlockCreateStats::skip(vm::CellSlice& cs) const { - return cs.advance(8) - && t_HashmapE_256_CreatorStats.skip(cs); + switch (get_tag(cs)) { + case block_create_stats: + return cs.advance(8) + && t_HashmapE_256_CreatorStats.skip(cs); + case block_create_stats_ext: + return cs.advance(8) + && t_HashmapAugE_256_CreatorStats_uint32.skip(cs); + } + return false; } -bool BlockCreateStats::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.fetch_ulong(8) == 23 - && t_HashmapE_256_CreatorStats.validate_skip(cs, weak); +bool BlockCreateStats::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case block_create_stats: + return cs.fetch_ulong(8) == 23 + && t_HashmapE_256_CreatorStats.validate_skip(ops, cs, weak); + case block_create_stats_ext: + return cs.fetch_ulong(8) == 0x34 + && t_HashmapAugE_256_CreatorStats_uint32.validate_skip(ops, cs, weak); + } + return false; } -bool BlockCreateStats::unpack(vm::CellSlice& cs, BlockCreateStats::Record& data) const { +bool BlockCreateStats::unpack(vm::CellSlice& cs, BlockCreateStats::Record_block_create_stats& data) const { return cs.fetch_ulong(8) == 23 && t_HashmapE_256_CreatorStats.fetch_to(cs, data.counters); } @@ -12443,7 +12682,7 @@ bool BlockCreateStats::unpack_block_create_stats(vm::CellSlice& cs, Ref cell_ref, BlockCreateStats::Record& data) const { +bool BlockCreateStats::cell_unpack(Ref cell_ref, BlockCreateStats::Record_block_create_stats& data) const { if (cell_ref.is_null()) { return false; } auto cs = load_cell_slice(std::move(cell_ref)); return unpack(cs, data) && cs.empty_ext(); @@ -12455,7 +12694,29 @@ bool BlockCreateStats::cell_unpack_block_create_stats(Ref cell_ref, Re return unpack_block_create_stats(cs, counters) && cs.empty_ext(); } -bool BlockCreateStats::pack(vm::CellBuilder& cb, const BlockCreateStats::Record& data) const { +bool BlockCreateStats::unpack(vm::CellSlice& cs, BlockCreateStats::Record_block_create_stats_ext& data) const { + return cs.fetch_ulong(8) == 0x34 + && t_HashmapAugE_256_CreatorStats_uint32.fetch_to(cs, data.counters); +} + +bool BlockCreateStats::unpack_block_create_stats_ext(vm::CellSlice& cs, Ref& counters) const { + return cs.fetch_ulong(8) == 0x34 + && t_HashmapAugE_256_CreatorStats_uint32.fetch_to(cs, counters); +} + +bool BlockCreateStats::cell_unpack(Ref cell_ref, BlockCreateStats::Record_block_create_stats_ext& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool BlockCreateStats::cell_unpack_block_create_stats_ext(Ref cell_ref, Ref& counters) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_block_create_stats_ext(cs, counters) && cs.empty_ext(); +} + +bool BlockCreateStats::pack(vm::CellBuilder& cb, const BlockCreateStats::Record_block_create_stats& data) const { return cb.store_long_bool(23, 8) && t_HashmapE_256_CreatorStats.store_from(cb, data.counters); } @@ -12465,7 +12726,7 @@ bool BlockCreateStats::pack_block_create_stats(vm::CellBuilder& cb, Ref& cell_ref, const BlockCreateStats::Record& data) const { +bool BlockCreateStats::cell_pack(Ref& cell_ref, const BlockCreateStats::Record_block_create_stats& data) const { vm::CellBuilder cb; return pack(cb, data) && std::move(cb).finalize_to(cell_ref); } @@ -12475,12 +12736,42 @@ bool BlockCreateStats::cell_pack_block_create_stats(Ref& cell_ref, Ref return pack_block_create_stats(cb, std::move(counters)) && std::move(cb).finalize_to(cell_ref); } +bool BlockCreateStats::pack(vm::CellBuilder& cb, const BlockCreateStats::Record_block_create_stats_ext& data) const { + return cb.store_long_bool(0x34, 8) + && t_HashmapAugE_256_CreatorStats_uint32.store_from(cb, data.counters); +} + +bool BlockCreateStats::pack_block_create_stats_ext(vm::CellBuilder& cb, Ref counters) const { + return cb.store_long_bool(0x34, 8) + && t_HashmapAugE_256_CreatorStats_uint32.store_from(cb, counters); +} + +bool BlockCreateStats::cell_pack(Ref& cell_ref, const BlockCreateStats::Record_block_create_stats_ext& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool BlockCreateStats::cell_pack_block_create_stats_ext(Ref& cell_ref, Ref counters) const { + vm::CellBuilder cb; + return pack_block_create_stats_ext(cb, std::move(counters)) && std::move(cb).finalize_to(cell_ref); +} + bool BlockCreateStats::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { - return cs.fetch_ulong(8) == 23 - && pp.open("block_create_stats") - && pp.field("counters") - && t_HashmapE_256_CreatorStats.print_skip(pp, cs) - && pp.close(); + switch (get_tag(cs)) { + case block_create_stats: + return cs.fetch_ulong(8) == 23 + && pp.open("block_create_stats") + && pp.field("counters") + && t_HashmapE_256_CreatorStats.print_skip(pp, cs) + && pp.close(); + case block_create_stats_ext: + return cs.fetch_ulong(8) == 0x34 + && pp.open("block_create_stats_ext") + && pp.field("counters") + && t_HashmapAugE_256_CreatorStats_uint32.print_skip(pp, cs) + && pp.close(); + } + return pp.fail("unknown constructor for BlockCreateStats"); } const BlockCreateStats t_BlockCreateStats; @@ -12504,15 +12795,15 @@ bool McStateExtra_aux::skip(vm::CellSlice& cs) const { && (!(flags & 1) || t_BlockCreateStats.skip(cs)); } -bool McStateExtra_aux::validate_skip(vm::CellSlice& cs, bool weak) const { +bool McStateExtra_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int flags; return cs.fetch_uint_to(16, flags) && flags <= 1 && cs.advance(65) - && t_OldMcBlocksInfo.validate_skip(cs, weak) + && t_OldMcBlocksInfo.validate_skip(ops, cs, weak) && cs.advance(1) - && t_Maybe_ExtBlkRef.validate_skip(cs, weak) - && (!(flags & 1) || t_BlockCreateStats.validate_skip(cs, weak)); + && t_Maybe_ExtBlkRef.validate_skip(ops, cs, weak) + && (!(flags & 1) || t_BlockCreateStats.validate_skip(ops, cs, weak)); } bool McStateExtra_aux::unpack(vm::CellSlice& cs, McStateExtra_aux::Record& data) const { @@ -12581,12 +12872,12 @@ bool McStateExtra::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); } -bool McStateExtra::validate_skip(vm::CellSlice& cs, bool weak) const { +bool McStateExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(16) == 0xcc26 - && t_ShardHashes.validate_skip(cs, weak) - && t_ConfigParams.validate_skip(cs, weak) - && t_McStateExtra_aux.validate_skip_ref(cs, weak) - && t_CurrencyCollection.validate_skip(cs, weak); + && t_ShardHashes.validate_skip(ops, cs, weak) + && t_ConfigParams.validate_skip(ops, cs, weak) + && t_McStateExtra_aux.validate_skip_ref(ops, cs, weak) + && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool McStateExtra::unpack(vm::CellSlice& cs, McStateExtra::Record& data) const { @@ -12643,7 +12934,7 @@ int SigPubKey::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(32) == 0x8e81278aU ? ed25519_pubkey : -1; } -bool SigPubKey::validate_skip(vm::CellSlice& cs, bool weak) const { +bool SigPubKey::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0x8e81278aU && cs.advance(256); } @@ -12708,7 +12999,7 @@ int CryptoSignatureSimple::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(4) == 5 ? ed25519_signature : -1; } -bool CryptoSignatureSimple::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CryptoSignatureSimple::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 5 && cs.advance(512); } @@ -12782,9 +13073,9 @@ bool CryptoSignaturePair::skip(vm::CellSlice& cs) const { && t_CryptoSignature.skip(cs); } -bool CryptoSignaturePair::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CryptoSignaturePair::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(256) - && t_CryptoSignature.validate_skip(cs, weak); + && t_CryptoSignature.validate_skip(ops, cs, weak); } bool CryptoSignaturePair::unpack(vm::CellSlice& cs, CryptoSignaturePair::Record& data) const { @@ -12848,9 +13139,9 @@ int Certificate::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(4) == 4 ? certificate : -1; } -bool Certificate::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Certificate::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 4 - && t_SigPubKey.validate_skip(cs, weak) + && t_SigPubKey.validate_skip(ops, cs, weak) && cs.advance(64); } @@ -12925,9 +13216,9 @@ int CertificateEnv::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(28) == 0xa419b7d ? certificate_env : -1; } -bool CertificateEnv::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CertificateEnv::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(28) == 0xa419b7d - && t_Certificate.validate_skip(cs, weak); + && t_Certificate.validate_skip(ops, cs, weak); } bool CertificateEnv::unpack(vm::CellSlice& cs, CertificateEnv::Record& data) const { @@ -12995,9 +13286,9 @@ bool SignedCertificate::skip(vm::CellSlice& cs) const { && t_CryptoSignature.skip(cs); } -bool SignedCertificate::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Certificate.validate_skip(cs, weak) - && t_CryptoSignature.validate_skip(cs, weak); +bool SignedCertificate::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Certificate.validate_skip(ops, cs, weak) + && t_CryptoSignature.validate_skip(ops, cs, weak); } bool SignedCertificate::unpack(vm::CellSlice& cs, SignedCertificate::Record& data) const { @@ -13079,14 +13370,14 @@ bool CryptoSignature::skip(vm::CellSlice& cs) const { return false; } -bool CryptoSignature::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CryptoSignature::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case cons1: - return t_CryptoSignatureSimple.validate_skip(cs, weak); + return t_CryptoSignatureSimple.validate_skip(ops, cs, weak); case chained_signature: return cs.fetch_ulong(4) == 15 - && t_SignedCertificate.validate_skip_ref(cs, weak) - && t_CryptoSignatureSimple.validate_skip(cs, weak); + && t_SignedCertificate.validate_skip_ref(ops, cs, weak) + && t_CryptoSignatureSimple.validate_skip(ops, cs, weak); } return false; } @@ -13210,10 +13501,10 @@ bool McBlockExtra_aux::skip(vm::CellSlice& cs) const { && t_Maybe_Ref_InMsg.skip(cs); } -bool McBlockExtra_aux::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_HashmapE_16_CryptoSignaturePair.validate_skip(cs, weak) - && t_Maybe_Ref_InMsg.validate_skip(cs, weak) - && t_Maybe_Ref_InMsg.validate_skip(cs, weak); +bool McBlockExtra_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_16_CryptoSignaturePair.validate_skip(ops, cs, weak) + && t_Maybe_Ref_InMsg.validate_skip(ops, cs, weak) + && t_Maybe_Ref_InMsg.validate_skip(ops, cs, weak); } bool McBlockExtra_aux::unpack(vm::CellSlice& cs, McBlockExtra_aux::Record& data) const { @@ -13294,14 +13585,14 @@ bool McBlockExtra::skip(vm::CellSlice& cs) const { && (!key_block || t_ConfigParams.skip(cs)); } -bool McBlockExtra::validate_skip(vm::CellSlice& cs, bool weak) const { +bool McBlockExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int key_block; return cs.fetch_ulong(16) == 0xcca5 && cs.fetch_bool_to(key_block) - && t_ShardHashes.validate_skip(cs, weak) - && t_ShardFees.validate_skip(cs, weak) - && t_McBlockExtra_aux.validate_skip_ref(cs, weak) - && (!key_block || t_ConfigParams.validate_skip(cs, weak)); + && t_ShardHashes.validate_skip(ops, cs, weak) + && t_ShardFees.validate_skip(ops, cs, weak) + && t_McBlockExtra_aux.validate_skip_ref(ops, cs, weak) + && (!key_block || t_ConfigParams.validate_skip(ops, cs, weak)); } bool McBlockExtra::unpack(vm::CellSlice& cs, McBlockExtra::Record& data) const { @@ -13378,15 +13669,15 @@ bool ValidatorDescr::skip(vm::CellSlice& cs) const { return false; } -bool ValidatorDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ValidatorDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case validator: return cs.fetch_ulong(8) == 0x53 - && t_SigPubKey.validate_skip(cs, weak) + && t_SigPubKey.validate_skip(ops, cs, weak) && cs.advance(64); case validator_addr: return cs.fetch_ulong(8) == 0x73 - && t_SigPubKey.validate_skip(cs, weak) + && t_SigPubKey.validate_skip(ops, cs, weak) && cs.advance(320); } return false; @@ -13560,7 +13851,7 @@ bool ValidatorSet::skip(vm::CellSlice& cs) const { return false; } -bool ValidatorSet::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ValidatorSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case validators: { int total, main; @@ -13570,7 +13861,7 @@ bool ValidatorSet::validate_skip(vm::CellSlice& cs, bool weak) const { && cs.fetch_uint_to(16, main) && main <= total && 1 <= main - && t_Hashmap_16_ValidatorDescr.validate_skip(cs, weak); + && t_Hashmap_16_ValidatorDescr.validate_skip(ops, cs, weak); } case validators_ext: { int total, main; @@ -13581,7 +13872,7 @@ bool ValidatorSet::validate_skip(vm::CellSlice& cs, bool weak) const { && main <= total && 1 <= main && cs.advance(64) - && t_HashmapE_16_ValidatorDescr.validate_skip(cs, weak); + && t_HashmapE_16_ValidatorDescr.validate_skip(ops, cs, weak); } } return false; @@ -13705,7 +13996,7 @@ int GlobalVersion::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0xc4 ? capabilities : -1; } -bool GlobalVersion::validate_skip(vm::CellSlice& cs, bool weak) const { +bool GlobalVersion::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0xc4 && cs.advance(96); } @@ -13803,7 +14094,7 @@ bool WorkchainFormat::skip(vm::CellSlice& cs) const { return false; } -bool WorkchainFormat::validate_skip(vm::CellSlice& cs, bool weak) const { +bool WorkchainFormat::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case wfmt_basic: return cs.fetch_ulong(4) == 1 @@ -13974,7 +14265,7 @@ bool WorkchainDescr::skip(vm::CellSlice& cs) const { && WorkchainFormat{basic}.skip(cs); } -bool WorkchainDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool WorkchainDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int actual_min_split, min_split, basic, flags; return cs.fetch_ulong(8) == 0xa6 && cs.advance(32) @@ -13987,7 +14278,7 @@ bool WorkchainDescr::validate_skip(vm::CellSlice& cs, bool weak) const { && cs.fetch_uint_to(13, flags) && flags == 0 && cs.advance(544) - && WorkchainFormat{basic}.validate_skip(cs, weak); + && WorkchainFormat{basic}.validate_skip(ops, cs, weak); } bool WorkchainDescr::unpack(vm::CellSlice& cs, WorkchainDescr::Record& data) const { @@ -14081,10 +14372,10 @@ bool BlockCreateFees::skip(vm::CellSlice& cs) const { && t_Grams.skip(cs); } -bool BlockCreateFees::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockCreateFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0x6b - && t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak); + && t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak); } bool BlockCreateFees::unpack(vm::CellSlice& cs, BlockCreateFees::Record& data) const { @@ -14154,7 +14445,7 @@ int StoragePrices::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0xcc ? cons1 : -1; } -bool StoragePrices::validate_skip(vm::CellSlice& cs, bool weak) const { +bool StoragePrices::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0xcc && cs.advance(288); } @@ -14242,7 +14533,7 @@ bool GasLimitsPrices::skip(vm::CellSlice& cs) const { return false; } -bool GasLimitsPrices::validate_skip(vm::CellSlice& cs, bool weak) const { +bool GasLimitsPrices::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case gas_prices: return cs.fetch_ulong(8) == 0xdd @@ -14253,7 +14544,7 @@ bool GasLimitsPrices::validate_skip(vm::CellSlice& cs, bool weak) const { case gas_flat_pfx: return cs.fetch_ulong(8) == 0xd1 && cs.advance(128) - && validate_skip(cs, weak); + && validate_skip(ops, cs, weak); } return false; } @@ -14418,7 +14709,7 @@ int ParamLimits::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0xc3 ? param_limits : -1; } -bool ParamLimits::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ParamLimits::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int underload, soft_limit, hard_limit; return cs.fetch_ulong(8) == 0xc3 && cs.fetch_uint_to(32, underload) @@ -14512,11 +14803,11 @@ int BlockLimits::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0x5d ? block_limits : -1; } -bool BlockLimits::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockLimits::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0x5d - && t_ParamLimits.validate_skip(cs, weak) - && t_ParamLimits.validate_skip(cs, weak) - && t_ParamLimits.validate_skip(cs, weak); + && t_ParamLimits.validate_skip(ops, cs, weak) + && t_ParamLimits.validate_skip(ops, cs, weak) + && t_ParamLimits.validate_skip(ops, cs, weak); } bool BlockLimits::unpack(vm::CellSlice& cs, BlockLimits::Record& data) const { @@ -14592,7 +14883,7 @@ int MsgForwardPrices::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0xea ? msg_forward_prices : -1; } -bool MsgForwardPrices::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgForwardPrices::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0xea && cs.advance(256); } @@ -14651,7 +14942,7 @@ int CatchainConfig::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0xc1 ? catchain_config : -1; } -bool CatchainConfig::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CatchainConfig::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0xc1 && cs.advance(128); } @@ -14704,7 +14995,7 @@ int ConsensusConfig::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(8) == 0xd6 ? consensus_config : -1; } -bool ConsensusConfig::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ConsensusConfig::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int round_candidates; return cs.fetch_ulong(8) == 0xd6 && cs.fetch_uint_to(32, round_candidates) @@ -14777,10 +15068,10 @@ int ValidatorTempKey::check_tag(const vm::CellSlice& cs) const { return cs.prefetch_ulong(4) == 3 ? validator_temp_key : -1; } -bool ValidatorTempKey::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ValidatorTempKey::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 3 && cs.advance(256) - && t_SigPubKey.validate_skip(cs, weak) + && t_SigPubKey.validate_skip(ops, cs, weak) && cs.advance(64); } @@ -14840,10 +15131,10 @@ bool ValidatorSignedTempKey::skip(vm::CellSlice& cs) const { && t_CryptoSignature.skip(cs); } -bool ValidatorSignedTempKey::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ValidatorSignedTempKey::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 4 - && t_ValidatorTempKey.validate_skip_ref(cs, weak) - && t_CryptoSignature.validate_skip(cs, weak); + && t_ValidatorTempKey.validate_skip_ref(ops, cs, weak) + && t_CryptoSignature.validate_skip(ops, cs, weak); } bool ValidatorSignedTempKey::unpack(vm::CellSlice& cs, ValidatorSignedTempKey::Record& data) const { @@ -15155,7 +15446,7 @@ bool ConfigParam::skip(vm::CellSlice& cs) const { return false; } -bool ConfigParam::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ConfigParam::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case cons0: return cs.advance(256) @@ -15173,23 +15464,23 @@ bool ConfigParam::validate_skip(vm::CellSlice& cs, bool weak) const { return cs.advance(256) && m_ == 4; case cons6: - return t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) + return t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) && m_ == 6; case cons7: - return t_ExtraCurrencyCollection.validate_skip(cs, weak) + return t_ExtraCurrencyCollection.validate_skip(ops, cs, weak) && m_ == 7; case cons8: - return t_GlobalVersion.validate_skip(cs, weak) + return t_GlobalVersion.validate_skip(ops, cs, weak) && m_ == 8; case cons9: - return t_Hashmap_32_True.validate_skip(cs, weak) + return t_Hashmap_32_True.validate_skip(ops, cs, weak) && m_ == 9; case cons12: - return t_HashmapE_32_WorkchainDescr.validate_skip(cs, weak) + return t_HashmapE_32_WorkchainDescr.validate_skip(ops, cs, weak) && m_ == 12; case cons14: - return t_BlockCreateFees.validate_skip(cs, weak) + return t_BlockCreateFees.validate_skip(ops, cs, weak) && m_ == 14; case cons15: return cs.advance(128) @@ -15205,61 +15496,61 @@ bool ConfigParam::validate_skip(vm::CellSlice& cs, bool weak) const { && m_ == 16; } case cons17: - return t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) - && t_Grams.validate_skip(cs, weak) + return t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) + && t_Grams.validate_skip(ops, cs, weak) && cs.advance(32) && m_ == 17; case cons18: - return t_Hashmap_32_StoragePrices.validate_skip(cs, weak) + return t_Hashmap_32_StoragePrices.validate_skip(ops, cs, weak) && m_ == 18; case config_mc_gas_prices: - return t_GasLimitsPrices.validate_skip(cs, weak) + return t_GasLimitsPrices.validate_skip(ops, cs, weak) && m_ == 20; case config_gas_prices: - return t_GasLimitsPrices.validate_skip(cs, weak) + return t_GasLimitsPrices.validate_skip(ops, cs, weak) && m_ == 21; case config_mc_block_limits: - return t_BlockLimits.validate_skip(cs, weak) + return t_BlockLimits.validate_skip(ops, cs, weak) && m_ == 22; case config_block_limits: - return t_BlockLimits.validate_skip(cs, weak) + return t_BlockLimits.validate_skip(ops, cs, weak) && m_ == 23; case config_mc_fwd_prices: - return t_MsgForwardPrices.validate_skip(cs, weak) + return t_MsgForwardPrices.validate_skip(ops, cs, weak) && m_ == 24; case config_fwd_prices: - return t_MsgForwardPrices.validate_skip(cs, weak) + return t_MsgForwardPrices.validate_skip(ops, cs, weak) && m_ == 25; case cons28: - return t_CatchainConfig.validate_skip(cs, weak) + return t_CatchainConfig.validate_skip(ops, cs, weak) && m_ == 28; case cons29: - return t_ConsensusConfig.validate_skip(cs, weak) + return t_ConsensusConfig.validate_skip(ops, cs, weak) && m_ == 29; case cons31: - return t_HashmapE_256_True.validate_skip(cs, weak) + return t_HashmapE_256_True.validate_skip(ops, cs, weak) && m_ == 31; case cons32: - return t_ValidatorSet.validate_skip(cs, weak) + return t_ValidatorSet.validate_skip(ops, cs, weak) && m_ == 32; case cons33: - return t_ValidatorSet.validate_skip(cs, weak) + return t_ValidatorSet.validate_skip(ops, cs, weak) && m_ == 33; case cons34: - return t_ValidatorSet.validate_skip(cs, weak) + return t_ValidatorSet.validate_skip(ops, cs, weak) && m_ == 34; case cons35: - return t_ValidatorSet.validate_skip(cs, weak) + return t_ValidatorSet.validate_skip(ops, cs, weak) && m_ == 35; case cons36: - return t_ValidatorSet.validate_skip(cs, weak) + return t_ValidatorSet.validate_skip(ops, cs, weak) && m_ == 36; case cons37: - return t_ValidatorSet.validate_skip(cs, weak) + return t_ValidatorSet.validate_skip(ops, cs, weak) && m_ == 37; case cons39: - return t_HashmapE_256_ValidatorSignedTempKey.validate_skip(cs, weak) + return t_HashmapE_256_ValidatorSignedTempKey.validate_skip(ops, cs, weak) && m_ == 39; } return false; @@ -16780,9 +17071,9 @@ bool BlockSignaturesPure::skip(vm::CellSlice& cs) const { && t_HashmapE_16_CryptoSignaturePair.skip(cs); } -bool BlockSignaturesPure::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockSignaturesPure::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.advance(96) - && t_HashmapE_16_CryptoSignaturePair.validate_skip(cs, weak); + && t_HashmapE_16_CryptoSignaturePair.validate_skip(ops, cs, weak); } bool BlockSignaturesPure::unpack(vm::CellSlice& cs, BlockSignaturesPure::Record& data) const { @@ -16856,10 +17147,10 @@ bool BlockSignatures::skip(vm::CellSlice& cs) const { && t_BlockSignaturesPure.skip(cs); } -bool BlockSignatures::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockSignatures::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 17 && cs.advance(64) - && t_BlockSignaturesPure.validate_skip(cs, weak); + && t_BlockSignaturesPure.validate_skip(ops, cs, weak); } bool BlockSignatures::unpack(vm::CellSlice& cs, BlockSignatures::Record& data) const { @@ -16934,11 +17225,11 @@ bool BlockProof::skip(vm::CellSlice& cs) const { && t_Maybe_Ref_BlockSignatures.skip(cs); } -bool BlockProof::validate_skip(vm::CellSlice& cs, bool weak) const { +bool BlockProof::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(8) == 0xc3 - && t_BlockIdExt.validate_skip(cs, weak) + && t_BlockIdExt.validate_skip(ops, cs, weak) && cs.advance_refs(1) - && t_Maybe_Ref_BlockSignatures.validate_skip(cs, weak); + && t_Maybe_Ref_BlockSignatures.validate_skip(ops, cs, weak); } bool BlockProof::unpack(vm::CellSlice& cs, BlockProof::Record& data) const { @@ -17038,7 +17329,7 @@ bool ProofChain::skip(vm::CellSlice& cs) const { return false; } -bool ProofChain::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ProofChain::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case chain_empty: return m_ == 0; @@ -17046,7 +17337,7 @@ bool ProofChain::validate_skip(vm::CellSlice& cs, bool weak) const { int n; return add_r1(n, 1, m_) && cs.advance_refs(1) - && (!n || ProofChain{n}.validate_skip_ref(cs, weak)); + && (!n || ProofChain{n}.validate_skip_ref(ops, cs, weak)); } } return false; @@ -17176,15 +17467,15 @@ bool TopBlockDescr::skip(vm::CellSlice& cs) const { && ProofChain{len}.skip(cs); } -bool TopBlockDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TopBlockDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len; return cs.fetch_ulong(8) == 0xd5 - && t_BlockIdExt.validate_skip(cs, weak) - && t_Maybe_Ref_BlockSignatures.validate_skip(cs, weak) + && t_BlockIdExt.validate_skip(ops, cs, weak) + && t_Maybe_Ref_BlockSignatures.validate_skip(ops, cs, weak) && cs.fetch_uint_to(8, len) && 1 <= len && len <= 8 - && ProofChain{len}.validate_skip(cs, weak); + && ProofChain{len}.validate_skip(ops, cs, weak); } bool TopBlockDescr::unpack(vm::CellSlice& cs, TopBlockDescr::Record& data) const { @@ -17251,9 +17542,9 @@ bool TopBlockDescrSet::skip(vm::CellSlice& cs) const { && t_HashmapE_96_Ref_TopBlockDescr.skip(cs); } -bool TopBlockDescrSet::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TopBlockDescrSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(32) == 0x4ac789f3 - && t_HashmapE_96_Ref_TopBlockDescr.validate_skip(cs, weak); + && t_HashmapE_96_Ref_TopBlockDescr.validate_skip(ops, cs, weak); } bool TopBlockDescrSet::unpack(vm::CellSlice& cs, TopBlockDescrSet::Record& data) const { @@ -17308,6 +17599,3450 @@ bool TopBlockDescrSet::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { const TopBlockDescrSet t_TopBlockDescrSet; +// +// code for type `VmCellSlice` +// + +int VmCellSlice::check_tag(const vm::CellSlice& cs) const { + return cons1; +} + +bool VmCellSlice::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + int st_bits, end_bits, st_ref, end_ref; + return cs.advance_refs(1) + && cs.fetch_uint_to(10, st_bits) + && cs.fetch_uint_to(10, end_bits) + && st_bits <= end_bits + && cs.fetch_uint_leq(4, st_ref) + && cs.fetch_uint_leq(4, end_ref) + && st_ref <= end_ref; +} + +bool VmCellSlice::unpack(vm::CellSlice& cs, VmCellSlice::Record& data) const { + return cs.fetch_ref_to(data.cell) + && cs.fetch_uint_to(10, data.st_bits) + && cs.fetch_uint_to(10, data.end_bits) + && data.st_bits <= data.end_bits + && cs.fetch_uint_leq(4, data.st_ref) + && cs.fetch_uint_leq(4, data.end_ref) + && data.st_ref <= data.end_ref; +} + +bool VmCellSlice::cell_unpack(Ref cell_ref, VmCellSlice::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCellSlice::pack(vm::CellBuilder& cb, const VmCellSlice::Record& data) const { + return cb.store_ref_bool(data.cell) + && cb.store_ulong_rchk_bool(data.st_bits, 10) + && cb.store_ulong_rchk_bool(data.end_bits, 10) + && data.st_bits <= data.end_bits + && cb.store_uint_leq(4, data.st_ref) + && cb.store_uint_leq(4, data.end_ref) + && data.st_ref <= data.end_ref; +} + +bool VmCellSlice::cell_pack(Ref& cell_ref, const VmCellSlice::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCellSlice::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + int st_bits, end_bits, st_ref, end_ref; + return pp.open() + && pp.field("cell") + && t_Anything.print_ref(pp, cs.fetch_ref()) + && cs.fetch_uint_to(10, st_bits) + && pp.field_int(st_bits, "st_bits") + && cs.fetch_uint_to(10, end_bits) + && pp.field_int(end_bits, "end_bits") + && st_bits <= end_bits + && cs.fetch_uint_leq(4, st_ref) + && pp.field_int(st_ref, "st_ref") + && cs.fetch_uint_leq(4, end_ref) + && pp.field_int(end_ref, "end_ref") + && st_ref <= end_ref + && pp.close(); +} + +const VmCellSlice t_VmCellSlice; + +// +// code for type `VmTupleRef` +// + +int VmTupleRef::get_tag(const vm::CellSlice& cs) const { + // distinguish by parameter `m_` using 1 2 3 3 + // static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); } + static signed char ctab[4] = { vm_tupref_nil, vm_tupref_single, vm_tupref_any, vm_tupref_any }; + return ctab[nat_abs(m_)]; +} + +int VmTupleRef::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_tupref_nil: + return vm_tupref_nil; + case vm_tupref_single: + return vm_tupref_single; + case vm_tupref_any: + return vm_tupref_any; + } + return -1; +} + +bool VmTupleRef::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_tupref_nil: + return m_ == 0; + case vm_tupref_single: + return cs.advance_refs(1) + && m_ == 1; + case vm_tupref_any: { + int n; + return add_r1(n, 2, m_) + && cs.advance_refs(1); + } + } + return false; +} + +bool VmTupleRef::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case vm_tupref_nil: + return m_ == 0; + case vm_tupref_single: + return t_VmStackValue.validate_skip_ref(ops, cs, weak) + && m_ == 1; + case vm_tupref_any: { + int n; + return add_r1(n, 2, m_) + && VmTuple{n + 2}.validate_skip_ref(ops, cs, weak); + } + } + return false; +} + +bool VmTupleRef::unpack(vm::CellSlice& cs, VmTupleRef::Record_vm_tupref_nil& data) const { + return m_ == 0; +} + +bool VmTupleRef::unpack_vm_tupref_nil(vm::CellSlice& cs) const { + return m_ == 0; +} + +bool VmTupleRef::cell_unpack(Ref cell_ref, VmTupleRef::Record_vm_tupref_nil& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmTupleRef::cell_unpack_vm_tupref_nil(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_tupref_nil(cs) && cs.empty_ext(); +} + +bool VmTupleRef::unpack(vm::CellSlice& cs, VmTupleRef::Record_vm_tupref_single& data) const { + return cs.fetch_ref_to(data.entry) + && m_ == 1; +} + +bool VmTupleRef::unpack_vm_tupref_single(vm::CellSlice& cs, Ref& entry) const { + return cs.fetch_ref_to(entry) + && m_ == 1; +} + +bool VmTupleRef::cell_unpack(Ref cell_ref, VmTupleRef::Record_vm_tupref_single& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmTupleRef::cell_unpack_vm_tupref_single(Ref cell_ref, Ref& entry) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_tupref_single(cs, entry) && cs.empty_ext(); +} + +bool VmTupleRef::unpack(vm::CellSlice& cs, VmTupleRef::Record_vm_tupref_any& data) const { + return add_r1(data.n, 2, m_) + && cs.fetch_ref_to(data.ref); +} + +bool VmTupleRef::unpack_vm_tupref_any(vm::CellSlice& cs, int& n, Ref& ref) const { + return add_r1(n, 2, m_) + && cs.fetch_ref_to(ref); +} + +bool VmTupleRef::cell_unpack(Ref cell_ref, VmTupleRef::Record_vm_tupref_any& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmTupleRef::cell_unpack_vm_tupref_any(Ref cell_ref, int& n, Ref& ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_tupref_any(cs, n, ref) && cs.empty_ext(); +} + +bool VmTupleRef::pack(vm::CellBuilder& cb, const VmTupleRef::Record_vm_tupref_nil& data) const { + return m_ == 0; +} + +bool VmTupleRef::pack_vm_tupref_nil(vm::CellBuilder& cb) const { + return m_ == 0; +} + +bool VmTupleRef::cell_pack(Ref& cell_ref, const VmTupleRef::Record_vm_tupref_nil& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTupleRef::cell_pack_vm_tupref_nil(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_vm_tupref_nil(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTupleRef::pack(vm::CellBuilder& cb, const VmTupleRef::Record_vm_tupref_single& data) const { + return cb.store_ref_bool(data.entry) + && m_ == 1; +} + +bool VmTupleRef::pack_vm_tupref_single(vm::CellBuilder& cb, Ref entry) const { + return cb.store_ref_bool(entry) + && m_ == 1; +} + +bool VmTupleRef::cell_pack(Ref& cell_ref, const VmTupleRef::Record_vm_tupref_single& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTupleRef::cell_pack_vm_tupref_single(Ref& cell_ref, Ref entry) const { + vm::CellBuilder cb; + return pack_vm_tupref_single(cb, std::move(entry)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTupleRef::pack(vm::CellBuilder& cb, const VmTupleRef::Record_vm_tupref_any& data) const { + int n; + return add_r1(n, 2, m_) + && cb.store_ref_bool(data.ref); +} + +bool VmTupleRef::pack_vm_tupref_any(vm::CellBuilder& cb, Ref ref) const { + int n; + return add_r1(n, 2, m_) + && cb.store_ref_bool(ref); +} + +bool VmTupleRef::cell_pack(Ref& cell_ref, const VmTupleRef::Record_vm_tupref_any& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTupleRef::cell_pack_vm_tupref_any(Ref& cell_ref, Ref ref) const { + vm::CellBuilder cb; + return pack_vm_tupref_any(cb, std::move(ref)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTupleRef::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_tupref_nil: + return pp.cons("vm_tupref_nil") + && m_ == 0; + case vm_tupref_single: + return pp.open("vm_tupref_single") + && pp.field("entry") + && t_VmStackValue.print_ref(pp, cs.fetch_ref()) + && m_ == 1 + && pp.close(); + case vm_tupref_any: { + int n; + return pp.open("vm_tupref_any") + && add_r1(n, 2, m_) + && pp.field("ref") + && VmTuple{n + 2}.print_ref(pp, cs.fetch_ref()) + && pp.close(); + } + } + return pp.fail("unknown constructor for VmTupleRef"); +} + + +// +// code for type `VmTuple` +// + +int VmTuple::get_tag(const vm::CellSlice& cs) const { + // distinguish by parameter `m_` using 1 2 2 2 + return m_ ? vm_tuple_tcons : vm_tuple_nil; +} + +int VmTuple::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_tuple_nil: + return vm_tuple_nil; + case vm_tuple_tcons: + return vm_tuple_tcons; + } + return -1; +} + +bool VmTuple::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_tuple_nil: + return m_ == 0; + case vm_tuple_tcons: { + int n; + return add_r1(n, 1, m_) + && VmTupleRef{n}.skip(cs) + && cs.advance_refs(1); + } + } + return false; +} + +bool VmTuple::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case vm_tuple_nil: + return m_ == 0; + case vm_tuple_tcons: { + int n; + return add_r1(n, 1, m_) + && VmTupleRef{n}.validate_skip(ops, cs, weak) + && t_VmStackValue.validate_skip_ref(ops, cs, weak); + } + } + return false; +} + +bool VmTuple::unpack(vm::CellSlice& cs, VmTuple::Record_vm_tuple_nil& data) const { + return m_ == 0; +} + +bool VmTuple::unpack_vm_tuple_nil(vm::CellSlice& cs) const { + return m_ == 0; +} + +bool VmTuple::cell_unpack(Ref cell_ref, VmTuple::Record_vm_tuple_nil& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmTuple::cell_unpack_vm_tuple_nil(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_tuple_nil(cs) && cs.empty_ext(); +} + +bool VmTuple::unpack(vm::CellSlice& cs, VmTuple::Record_vm_tuple_tcons& data) const { + return add_r1(data.n, 1, m_) + && VmTupleRef{data.n}.fetch_to(cs, data.head) + && cs.fetch_ref_to(data.tail); +} + +bool VmTuple::unpack_vm_tuple_tcons(vm::CellSlice& cs, int& n, Ref& head, Ref& tail) const { + return add_r1(n, 1, m_) + && VmTupleRef{n}.fetch_to(cs, head) + && cs.fetch_ref_to(tail); +} + +bool VmTuple::cell_unpack(Ref cell_ref, VmTuple::Record_vm_tuple_tcons& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmTuple::cell_unpack_vm_tuple_tcons(Ref cell_ref, int& n, Ref& head, Ref& tail) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_tuple_tcons(cs, n, head, tail) && cs.empty_ext(); +} + +bool VmTuple::pack(vm::CellBuilder& cb, const VmTuple::Record_vm_tuple_nil& data) const { + return m_ == 0; +} + +bool VmTuple::pack_vm_tuple_nil(vm::CellBuilder& cb) const { + return m_ == 0; +} + +bool VmTuple::cell_pack(Ref& cell_ref, const VmTuple::Record_vm_tuple_nil& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTuple::cell_pack_vm_tuple_nil(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_vm_tuple_nil(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTuple::pack(vm::CellBuilder& cb, const VmTuple::Record_vm_tuple_tcons& data) const { + int n; + return add_r1(n, 1, m_) + && VmTupleRef{n}.store_from(cb, data.head) + && cb.store_ref_bool(data.tail); +} + +bool VmTuple::pack_vm_tuple_tcons(vm::CellBuilder& cb, Ref head, Ref tail) const { + int n; + return add_r1(n, 1, m_) + && VmTupleRef{n}.store_from(cb, head) + && cb.store_ref_bool(tail); +} + +bool VmTuple::cell_pack(Ref& cell_ref, const VmTuple::Record_vm_tuple_tcons& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTuple::cell_pack_vm_tuple_tcons(Ref& cell_ref, Ref head, Ref tail) const { + vm::CellBuilder cb; + return pack_vm_tuple_tcons(cb, std::move(head), std::move(tail)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmTuple::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_tuple_nil: + return pp.cons("vm_tuple_nil") + && m_ == 0; + case vm_tuple_tcons: { + int n; + return pp.open("vm_tuple_tcons") + && add_r1(n, 1, m_) + && pp.field("head") + && VmTupleRef{n}.print_skip(pp, cs) + && pp.field("tail") + && t_VmStackValue.print_ref(pp, cs.fetch_ref()) + && pp.close(); + } + } + return pp.fail("unknown constructor for VmTuple"); +} + + +// +// code for type `VmStackValue` +// +constexpr char VmStackValue::cons_len[9]; +constexpr unsigned short VmStackValue::cons_tag[9]; + +int VmStackValue::get_tag(const vm::CellSlice& cs) const { + switch (cs.bselect(6, 7)) { + case 0: + if (cs.bit_at(6)) { + if (cs.bit_at(7)) { + return vm_stk_cell; + } else { + return cs.bit_at(8) ? vm_stk_nan : vm_stk_int; + } + } else { + return cs.bit_at(7) ? vm_stk_tinyint : vm_stk_null; + } + case 1: + if (cs.bit_at(6)) { + return cs.bit_at(7) ? vm_stk_tuple : vm_stk_cont; + } else { + return cs.bit_at(7) ? vm_stk_builder : vm_stk_slice; + } + default: + return -1; + } +} + +int VmStackValue::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_stk_null: + return cs.prefetch_ulong(8) == 0 ? vm_stk_null : -1; + case vm_stk_tinyint: + return cs.prefetch_ulong(8) == 1 ? vm_stk_tinyint : -1; + case vm_stk_int: + return cs.prefetch_ulong(15) == 0x100 ? vm_stk_int : -1; + case vm_stk_nan: + return cs.prefetch_ulong(16) == 0x2ff ? vm_stk_nan : -1; + case vm_stk_cell: + return cs.prefetch_ulong(8) == 3 ? vm_stk_cell : -1; + case vm_stk_slice: + return cs.prefetch_ulong(8) == 4 ? vm_stk_slice : -1; + case vm_stk_builder: + return cs.prefetch_ulong(8) == 5 ? vm_stk_builder : -1; + case vm_stk_cont: + return cs.prefetch_ulong(8) == 6 ? vm_stk_cont : -1; + case vm_stk_tuple: + return cs.prefetch_ulong(8) == 7 ? vm_stk_tuple : -1; + } + return -1; +} + +bool VmStackValue::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_stk_null: + return cs.advance(8); + case vm_stk_tinyint: + return cs.advance(72); + case vm_stk_int: + return cs.advance(272); + case vm_stk_nan: + return cs.advance(16); + case vm_stk_cell: + return cs.advance_ext(0x10008); + case vm_stk_slice: + return cs.advance_ext(0x10022); + case vm_stk_builder: + return cs.advance_ext(0x10008); + case vm_stk_cont: + return cs.advance(8) + && t_VmCont.skip(cs); + case vm_stk_tuple: { + int len; + return cs.advance(8) + && cs.fetch_uint_to(16, len) + && VmTuple{len}.skip(cs); + } + } + return false; +} + +bool VmStackValue::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case vm_stk_null: + return cs.fetch_ulong(8) == 0; + case vm_stk_tinyint: + return cs.fetch_ulong(8) == 1 + && cs.advance(64); + case vm_stk_int: + return cs.fetch_ulong(15) == 0x100 + && cs.advance(257); + case vm_stk_nan: + return cs.fetch_ulong(16) == 0x2ff; + case vm_stk_cell: + return cs.fetch_ulong(8) == 3 + && cs.advance_refs(1); + case vm_stk_slice: + return cs.fetch_ulong(8) == 4 + && t_VmCellSlice.validate_skip(ops, cs, weak); + case vm_stk_builder: + return cs.fetch_ulong(8) == 5 + && cs.advance_refs(1); + case vm_stk_cont: + return cs.fetch_ulong(8) == 6 + && t_VmCont.validate_skip(ops, cs, weak); + case vm_stk_tuple: { + int len; + return cs.fetch_ulong(8) == 7 + && cs.fetch_uint_to(16, len) + && VmTuple{len}.validate_skip(ops, cs, weak); + } + } + return false; +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_null& data) const { + return cs.fetch_ulong(8) == 0; +} + +bool VmStackValue::unpack_vm_stk_null(vm::CellSlice& cs) const { + return cs.fetch_ulong(8) == 0; +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_null& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_null(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_null(cs) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_tinyint& data) const { + return cs.fetch_ulong(8) == 1 + && cs.fetch_int_to(64, data.value); +} + +bool VmStackValue::unpack_vm_stk_tinyint(vm::CellSlice& cs, long long& value) const { + return cs.fetch_ulong(8) == 1 + && cs.fetch_int_to(64, value); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_tinyint& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_tinyint(Ref cell_ref, long long& value) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_tinyint(cs, value) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_int& data) const { + return cs.fetch_ulong(15) == 0x100 + && cs.fetch_int256_to(257, data.value); +} + +bool VmStackValue::unpack_vm_stk_int(vm::CellSlice& cs, RefInt256& value) const { + return cs.fetch_ulong(15) == 0x100 + && cs.fetch_int256_to(257, value); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_int& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_int(Ref cell_ref, RefInt256& value) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_int(cs, value) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_nan& data) const { + return cs.fetch_ulong(16) == 0x2ff; +} + +bool VmStackValue::unpack_vm_stk_nan(vm::CellSlice& cs) const { + return cs.fetch_ulong(16) == 0x2ff; +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_nan& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_nan(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_nan(cs) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_cell& data) const { + return cs.fetch_ulong(8) == 3 + && cs.fetch_ref_to(data.cell); +} + +bool VmStackValue::unpack_vm_stk_cell(vm::CellSlice& cs, Ref& cell) const { + return cs.fetch_ulong(8) == 3 + && cs.fetch_ref_to(cell); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_cell& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_cell(Ref cell_ref, Ref& cell) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_cell(cs, cell) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_slice& data) const { + return cs.fetch_ulong(8) == 4 + && cs.fetch_subslice_ext_to(0x1001a, data.x); +} + +bool VmStackValue::unpack_vm_stk_slice(vm::CellSlice& cs, Ref& x) const { + return cs.fetch_ulong(8) == 4 + && cs.fetch_subslice_ext_to(0x1001a, x); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_slice& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_slice(Ref cell_ref, Ref& x) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_slice(cs, x) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_builder& data) const { + return cs.fetch_ulong(8) == 5 + && cs.fetch_ref_to(data.cell); +} + +bool VmStackValue::unpack_vm_stk_builder(vm::CellSlice& cs, Ref& cell) const { + return cs.fetch_ulong(8) == 5 + && cs.fetch_ref_to(cell); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_builder& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_builder(Ref cell_ref, Ref& cell) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_builder(cs, cell) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_cont& data) const { + return cs.fetch_ulong(8) == 6 + && t_VmCont.fetch_to(cs, data.cont); +} + +bool VmStackValue::unpack_vm_stk_cont(vm::CellSlice& cs, Ref& cont) const { + return cs.fetch_ulong(8) == 6 + && t_VmCont.fetch_to(cs, cont); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_cont& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_cont(Ref cell_ref, Ref& cont) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_cont(cs, cont) && cs.empty_ext(); +} + +bool VmStackValue::unpack(vm::CellSlice& cs, VmStackValue::Record_vm_stk_tuple& data) const { + return cs.fetch_ulong(8) == 7 + && cs.fetch_uint_to(16, data.len) + && VmTuple{data.len}.fetch_to(cs, data.data); +} + +bool VmStackValue::unpack_vm_stk_tuple(vm::CellSlice& cs, int& len, Ref& data) const { + return cs.fetch_ulong(8) == 7 + && cs.fetch_uint_to(16, len) + && VmTuple{len}.fetch_to(cs, data); +} + +bool VmStackValue::cell_unpack(Ref cell_ref, VmStackValue::Record_vm_stk_tuple& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackValue::cell_unpack_vm_stk_tuple(Ref cell_ref, int& len, Ref& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_tuple(cs, len, data) && cs.empty_ext(); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_null& data) const { + return cb.store_long_bool(0, 8); +} + +bool VmStackValue::pack_vm_stk_null(vm::CellBuilder& cb) const { + return cb.store_long_bool(0, 8); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_null& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_null(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_vm_stk_null(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_tinyint& data) const { + return cb.store_long_bool(1, 8) + && cb.store_long_rchk_bool(data.value, 64); +} + +bool VmStackValue::pack_vm_stk_tinyint(vm::CellBuilder& cb, long long value) const { + return cb.store_long_bool(1, 8) + && cb.store_long_rchk_bool(value, 64); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_tinyint& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_tinyint(Ref& cell_ref, long long value) const { + vm::CellBuilder cb; + return pack_vm_stk_tinyint(cb, value) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_int& data) const { + return cb.store_long_bool(0x100, 15) + && cb.store_int256_bool(data.value, 257); +} + +bool VmStackValue::pack_vm_stk_int(vm::CellBuilder& cb, RefInt256 value) const { + return cb.store_long_bool(0x100, 15) + && cb.store_int256_bool(value, 257); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_int& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_int(Ref& cell_ref, RefInt256 value) const { + vm::CellBuilder cb; + return pack_vm_stk_int(cb, std::move(value)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_nan& data) const { + return cb.store_long_bool(0x2ff, 16); +} + +bool VmStackValue::pack_vm_stk_nan(vm::CellBuilder& cb) const { + return cb.store_long_bool(0x2ff, 16); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_nan& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_nan(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_vm_stk_nan(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_cell& data) const { + return cb.store_long_bool(3, 8) + && cb.store_ref_bool(data.cell); +} + +bool VmStackValue::pack_vm_stk_cell(vm::CellBuilder& cb, Ref cell) const { + return cb.store_long_bool(3, 8) + && cb.store_ref_bool(cell); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_cell& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_cell(Ref& cell_ref, Ref cell) const { + vm::CellBuilder cb; + return pack_vm_stk_cell(cb, std::move(cell)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_slice& data) const { + return cb.store_long_bool(4, 8) + && cb.append_cellslice_chk(data.x, 0x1001a); +} + +bool VmStackValue::pack_vm_stk_slice(vm::CellBuilder& cb, Ref x) const { + return cb.store_long_bool(4, 8) + && cb.append_cellslice_chk(x, 0x1001a); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_slice& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_slice(Ref& cell_ref, Ref x) const { + vm::CellBuilder cb; + return pack_vm_stk_slice(cb, std::move(x)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_builder& data) const { + return cb.store_long_bool(5, 8) + && cb.store_ref_bool(data.cell); +} + +bool VmStackValue::pack_vm_stk_builder(vm::CellBuilder& cb, Ref cell) const { + return cb.store_long_bool(5, 8) + && cb.store_ref_bool(cell); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_builder& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_builder(Ref& cell_ref, Ref cell) const { + vm::CellBuilder cb; + return pack_vm_stk_builder(cb, std::move(cell)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_cont& data) const { + return cb.store_long_bool(6, 8) + && t_VmCont.store_from(cb, data.cont); +} + +bool VmStackValue::pack_vm_stk_cont(vm::CellBuilder& cb, Ref cont) const { + return cb.store_long_bool(6, 8) + && t_VmCont.store_from(cb, cont); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_cont& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_cont(Ref& cell_ref, Ref cont) const { + vm::CellBuilder cb; + return pack_vm_stk_cont(cb, std::move(cont)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::pack(vm::CellBuilder& cb, const VmStackValue::Record_vm_stk_tuple& data) const { + return cb.store_long_bool(7, 8) + && cb.store_ulong_rchk_bool(data.len, 16) + && VmTuple{data.len}.store_from(cb, data.data); +} + +bool VmStackValue::pack_vm_stk_tuple(vm::CellBuilder& cb, int len, Ref data) const { + return cb.store_long_bool(7, 8) + && cb.store_ulong_rchk_bool(len, 16) + && VmTuple{len}.store_from(cb, data); +} + +bool VmStackValue::cell_pack(Ref& cell_ref, const VmStackValue::Record_vm_stk_tuple& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::cell_pack_vm_stk_tuple(Ref& cell_ref, int len, Ref data) const { + vm::CellBuilder cb; + return pack_vm_stk_tuple(cb, len, std::move(data)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackValue::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_stk_null: + return cs.fetch_ulong(8) == 0 + && pp.cons("vm_stk_null"); + case vm_stk_tinyint: + return cs.fetch_ulong(8) == 1 + && pp.open("vm_stk_tinyint") + && pp.fetch_int_field(cs, 64, "value") + && pp.close(); + case vm_stk_int: + return cs.fetch_ulong(15) == 0x100 + && pp.open("vm_stk_int") + && pp.fetch_int256_field(cs, 257, "value") + && pp.close(); + case vm_stk_nan: + return cs.fetch_ulong(16) == 0x2ff + && pp.cons("vm_stk_nan"); + case vm_stk_cell: + return cs.fetch_ulong(8) == 3 + && pp.open("vm_stk_cell") + && pp.field("cell") + && t_Anything.print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vm_stk_slice: + return cs.fetch_ulong(8) == 4 + && pp.open("vm_stk_slice") + && pp.field() + && t_VmCellSlice.print_skip(pp, cs) + && pp.close(); + case vm_stk_builder: + return cs.fetch_ulong(8) == 5 + && pp.open("vm_stk_builder") + && pp.field("cell") + && t_Anything.print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vm_stk_cont: + return cs.fetch_ulong(8) == 6 + && pp.open("vm_stk_cont") + && pp.field("cont") + && t_VmCont.print_skip(pp, cs) + && pp.close(); + case vm_stk_tuple: { + int len; + return cs.fetch_ulong(8) == 7 + && pp.open("vm_stk_tuple") + && cs.fetch_uint_to(16, len) + && pp.field_int(len, "len") + && pp.field("data") + && VmTuple{len}.print_skip(pp, cs) + && pp.close(); + } + } + return pp.fail("unknown constructor for VmStackValue"); +} + +const VmStackValue t_VmStackValue; + +// +// code for type `VmStack` +// + +int VmStack::check_tag(const vm::CellSlice& cs) const { + return vm_stack; +} + +bool VmStack::skip(vm::CellSlice& cs) const { + int depth; + return cs.fetch_uint_to(24, depth) + && VmStackList{depth}.skip(cs); +} + +bool VmStack::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + int depth; + return cs.fetch_uint_to(24, depth) + && VmStackList{depth}.validate_skip(ops, cs, weak); +} + +bool VmStack::unpack(vm::CellSlice& cs, VmStack::Record& data) const { + return cs.fetch_uint_to(24, data.depth) + && VmStackList{data.depth}.fetch_to(cs, data.stack); +} + +bool VmStack::unpack_vm_stack(vm::CellSlice& cs, int& depth, Ref& stack) const { + return cs.fetch_uint_to(24, depth) + && VmStackList{depth}.fetch_to(cs, stack); +} + +bool VmStack::cell_unpack(Ref cell_ref, VmStack::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStack::cell_unpack_vm_stack(Ref cell_ref, int& depth, Ref& stack) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stack(cs, depth, stack) && cs.empty_ext(); +} + +bool VmStack::pack(vm::CellBuilder& cb, const VmStack::Record& data) const { + return cb.store_ulong_rchk_bool(data.depth, 24) + && VmStackList{data.depth}.store_from(cb, data.stack); +} + +bool VmStack::pack_vm_stack(vm::CellBuilder& cb, int depth, Ref stack) const { + return cb.store_ulong_rchk_bool(depth, 24) + && VmStackList{depth}.store_from(cb, stack); +} + +bool VmStack::cell_pack(Ref& cell_ref, const VmStack::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStack::cell_pack_vm_stack(Ref& cell_ref, int depth, Ref stack) const { + vm::CellBuilder cb; + return pack_vm_stack(cb, depth, std::move(stack)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStack::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + int depth; + return pp.open("vm_stack") + && cs.fetch_uint_to(24, depth) + && pp.field_int(depth, "depth") + && pp.field("stack") + && VmStackList{depth}.print_skip(pp, cs) + && pp.close(); +} + +const VmStack t_VmStack; + +// +// code for type `VmStackList` +// + +int VmStackList::get_tag(const vm::CellSlice& cs) const { + // distinguish by parameter `m_` using 2 1 1 1 + return m_ ? vm_stk_cons : vm_stk_nil; +} + +int VmStackList::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_stk_cons: + return vm_stk_cons; + case vm_stk_nil: + return vm_stk_nil; + } + return -1; +} + +bool VmStackList::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_stk_cons: { + int n; + return add_r1(n, 1, m_) + && cs.advance_refs(1) + && t_VmStackValue.skip(cs); + } + case vm_stk_nil: + return m_ == 0; + } + return false; +} + +bool VmStackList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case vm_stk_cons: { + int n; + return add_r1(n, 1, m_) + && VmStackList{n}.validate_skip_ref(ops, cs, weak) + && t_VmStackValue.validate_skip(ops, cs, weak); + } + case vm_stk_nil: + return m_ == 0; + } + return false; +} + +bool VmStackList::unpack(vm::CellSlice& cs, VmStackList::Record_vm_stk_cons& data) const { + return add_r1(data.n, 1, m_) + && cs.fetch_ref_to(data.rest) + && t_VmStackValue.fetch_to(cs, data.tos); +} + +bool VmStackList::unpack_vm_stk_cons(vm::CellSlice& cs, int& n, Ref& rest, Ref& tos) const { + return add_r1(n, 1, m_) + && cs.fetch_ref_to(rest) + && t_VmStackValue.fetch_to(cs, tos); +} + +bool VmStackList::cell_unpack(Ref cell_ref, VmStackList::Record_vm_stk_cons& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackList::cell_unpack_vm_stk_cons(Ref cell_ref, int& n, Ref& rest, Ref& tos) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_cons(cs, n, rest, tos) && cs.empty_ext(); +} + +bool VmStackList::unpack(vm::CellSlice& cs, VmStackList::Record_vm_stk_nil& data) const { + return m_ == 0; +} + +bool VmStackList::unpack_vm_stk_nil(vm::CellSlice& cs) const { + return m_ == 0; +} + +bool VmStackList::cell_unpack(Ref cell_ref, VmStackList::Record_vm_stk_nil& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmStackList::cell_unpack_vm_stk_nil(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vm_stk_nil(cs) && cs.empty_ext(); +} + +bool VmStackList::pack(vm::CellBuilder& cb, const VmStackList::Record_vm_stk_cons& data) const { + int n; + return add_r1(n, 1, m_) + && cb.store_ref_bool(data.rest) + && t_VmStackValue.store_from(cb, data.tos); +} + +bool VmStackList::pack_vm_stk_cons(vm::CellBuilder& cb, Ref rest, Ref tos) const { + int n; + return add_r1(n, 1, m_) + && cb.store_ref_bool(rest) + && t_VmStackValue.store_from(cb, tos); +} + +bool VmStackList::cell_pack(Ref& cell_ref, const VmStackList::Record_vm_stk_cons& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackList::cell_pack_vm_stk_cons(Ref& cell_ref, Ref rest, Ref tos) const { + vm::CellBuilder cb; + return pack_vm_stk_cons(cb, std::move(rest), std::move(tos)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackList::pack(vm::CellBuilder& cb, const VmStackList::Record_vm_stk_nil& data) const { + return m_ == 0; +} + +bool VmStackList::pack_vm_stk_nil(vm::CellBuilder& cb) const { + return m_ == 0; +} + +bool VmStackList::cell_pack(Ref& cell_ref, const VmStackList::Record_vm_stk_nil& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackList::cell_pack_vm_stk_nil(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_vm_stk_nil(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool VmStackList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vm_stk_cons: { + int n; + return pp.open("vm_stk_cons") + && add_r1(n, 1, m_) + && pp.field("rest") + && VmStackList{n}.print_ref(pp, cs.fetch_ref()) + && pp.field("tos") + && t_VmStackValue.print_skip(pp, cs) + && pp.close(); + } + case vm_stk_nil: + return pp.cons("vm_stk_nil") + && m_ == 0; + } + return pp.fail("unknown constructor for VmStackList"); +} + + +// +// code for type `VmSaveList` +// + +int VmSaveList::check_tag(const vm::CellSlice& cs) const { + return cons1; +} + +bool VmSaveList::skip(vm::CellSlice& cs) const { + return t_HashmapE_4_VmStackValue.skip(cs); +} + +bool VmSaveList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_4_VmStackValue.validate_skip(ops, cs, weak); +} + +bool VmSaveList::unpack(vm::CellSlice& cs, VmSaveList::Record& data) const { + return t_HashmapE_4_VmStackValue.fetch_to(cs, data.cregs); +} + +bool VmSaveList::unpack_cons1(vm::CellSlice& cs, Ref& cregs) const { + return t_HashmapE_4_VmStackValue.fetch_to(cs, cregs); +} + +bool VmSaveList::cell_unpack(Ref cell_ref, VmSaveList::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmSaveList::cell_unpack_cons1(Ref cell_ref, Ref& cregs) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cons1(cs, cregs) && cs.empty_ext(); +} + +bool VmSaveList::pack(vm::CellBuilder& cb, const VmSaveList::Record& data) const { + return t_HashmapE_4_VmStackValue.store_from(cb, data.cregs); +} + +bool VmSaveList::pack_cons1(vm::CellBuilder& cb, Ref cregs) const { + return t_HashmapE_4_VmStackValue.store_from(cb, cregs); +} + +bool VmSaveList::cell_pack(Ref& cell_ref, const VmSaveList::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmSaveList::cell_pack_cons1(Ref& cell_ref, Ref cregs) const { + vm::CellBuilder cb; + return pack_cons1(cb, std::move(cregs)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmSaveList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return pp.open() + && pp.field("cregs") + && t_HashmapE_4_VmStackValue.print_skip(pp, cs) + && pp.close(); +} + +const VmSaveList t_VmSaveList; + +// +// code for auxiliary type `VmGasLimits_aux` +// + +int VmGasLimits_aux::check_tag(const vm::CellSlice& cs) const { + return cons1; +} + +bool VmGasLimits_aux::unpack(vm::CellSlice& cs, VmGasLimits_aux::Record& data) const { + return cs.fetch_int_to(64, data.max_limit) + && cs.fetch_int_to(64, data.cur_limit) + && cs.fetch_int_to(64, data.credit); +} + +bool VmGasLimits_aux::unpack_cons1(vm::CellSlice& cs, long long& max_limit, long long& cur_limit, long long& credit) const { + return cs.fetch_int_to(64, max_limit) + && cs.fetch_int_to(64, cur_limit) + && cs.fetch_int_to(64, credit); +} + +bool VmGasLimits_aux::cell_unpack(Ref cell_ref, VmGasLimits_aux::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmGasLimits_aux::cell_unpack_cons1(Ref cell_ref, long long& max_limit, long long& cur_limit, long long& credit) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cons1(cs, max_limit, cur_limit, credit) && cs.empty_ext(); +} + +bool VmGasLimits_aux::pack(vm::CellBuilder& cb, const VmGasLimits_aux::Record& data) const { + return cb.store_long_rchk_bool(data.max_limit, 64) + && cb.store_long_rchk_bool(data.cur_limit, 64) + && cb.store_long_rchk_bool(data.credit, 64); +} + +bool VmGasLimits_aux::pack_cons1(vm::CellBuilder& cb, long long max_limit, long long cur_limit, long long credit) const { + return cb.store_long_rchk_bool(max_limit, 64) + && cb.store_long_rchk_bool(cur_limit, 64) + && cb.store_long_rchk_bool(credit, 64); +} + +bool VmGasLimits_aux::cell_pack(Ref& cell_ref, const VmGasLimits_aux::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmGasLimits_aux::cell_pack_cons1(Ref& cell_ref, long long max_limit, long long cur_limit, long long credit) const { + vm::CellBuilder cb; + return pack_cons1(cb, max_limit, cur_limit, credit) && std::move(cb).finalize_to(cell_ref); +} + +bool VmGasLimits_aux::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return pp.open() + && pp.fetch_int_field(cs, 64, "max_limit") + && pp.fetch_int_field(cs, 64, "cur_limit") + && pp.fetch_int_field(cs, 64, "credit") + && pp.close(); +} + +const VmGasLimits_aux t_VmGasLimits_aux; + +// +// code for type `VmGasLimits` +// + +int VmGasLimits::check_tag(const vm::CellSlice& cs) const { + return gas_limits; +} + +bool VmGasLimits::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.advance(64) + && t_VmGasLimits_aux.validate_skip_ref(ops, cs, weak); +} + +bool VmGasLimits::unpack(vm::CellSlice& cs, VmGasLimits::Record& data) const { + return cs.fetch_int_to(64, data.remaining) + && t_VmGasLimits_aux.cell_unpack(cs.fetch_ref(), data.r1); +} + +bool VmGasLimits::cell_unpack(Ref cell_ref, VmGasLimits::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmGasLimits::pack(vm::CellBuilder& cb, const VmGasLimits::Record& data) const { + Ref tmp_cell; + return cb.store_long_rchk_bool(data.remaining, 64) + && t_VmGasLimits_aux.cell_pack(tmp_cell, data.r1) + && cb.store_ref_bool(std::move(tmp_cell)); +} + +bool VmGasLimits::cell_pack(Ref& cell_ref, const VmGasLimits::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmGasLimits::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return pp.open("gas_limits") + && pp.fetch_int_field(cs, 64, "remaining") + && pp.field() + && t_VmGasLimits_aux.print_ref(pp, cs.fetch_ref()) + && pp.close(); +} + +const VmGasLimits t_VmGasLimits; + +// +// code for type `VmLibraries` +// + +int VmLibraries::check_tag(const vm::CellSlice& cs) const { + return cons1; +} + +bool VmLibraries::skip(vm::CellSlice& cs) const { + return t_HashmapE_256_Ref_Cell.skip(cs); +} + +bool VmLibraries::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_256_Ref_Cell.validate_skip(ops, cs, weak); +} + +bool VmLibraries::unpack(vm::CellSlice& cs, VmLibraries::Record& data) const { + return t_HashmapE_256_Ref_Cell.fetch_to(cs, data.libraries); +} + +bool VmLibraries::unpack_cons1(vm::CellSlice& cs, Ref& libraries) const { + return t_HashmapE_256_Ref_Cell.fetch_to(cs, libraries); +} + +bool VmLibraries::cell_unpack(Ref cell_ref, VmLibraries::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmLibraries::cell_unpack_cons1(Ref cell_ref, Ref& libraries) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cons1(cs, libraries) && cs.empty_ext(); +} + +bool VmLibraries::pack(vm::CellBuilder& cb, const VmLibraries::Record& data) const { + return t_HashmapE_256_Ref_Cell.store_from(cb, data.libraries); +} + +bool VmLibraries::pack_cons1(vm::CellBuilder& cb, Ref libraries) const { + return t_HashmapE_256_Ref_Cell.store_from(cb, libraries); +} + +bool VmLibraries::cell_pack(Ref& cell_ref, const VmLibraries::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmLibraries::cell_pack_cons1(Ref& cell_ref, Ref libraries) const { + vm::CellBuilder cb; + return pack_cons1(cb, std::move(libraries)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmLibraries::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return pp.open() + && pp.field("libraries") + && t_HashmapE_256_Ref_Cell.print_skip(pp, cs) + && pp.close(); +} + +const VmLibraries t_VmLibraries; + +// +// code for type `VmControlData` +// + +int VmControlData::check_tag(const vm::CellSlice& cs) const { + return vm_ctl_data; +} + +bool VmControlData::skip(vm::CellSlice& cs) const { + return t_Maybe_uint13.skip(cs) + && t_Maybe_VmStack.skip(cs) + && t_VmSaveList.skip(cs) + && t_Maybe_int16.skip(cs); +} + +bool VmControlData::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Maybe_uint13.validate_skip(ops, cs, weak) + && t_Maybe_VmStack.validate_skip(ops, cs, weak) + && t_VmSaveList.validate_skip(ops, cs, weak) + && t_Maybe_int16.validate_skip(ops, cs, weak); +} + +bool VmControlData::unpack(vm::CellSlice& cs, VmControlData::Record& data) const { + return t_Maybe_uint13.fetch_to(cs, data.nargs) + && t_Maybe_VmStack.fetch_to(cs, data.stack) + && t_VmSaveList.fetch_to(cs, data.save) + && t_Maybe_int16.fetch_to(cs, data.cp); +} + +bool VmControlData::cell_unpack(Ref cell_ref, VmControlData::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmControlData::pack(vm::CellBuilder& cb, const VmControlData::Record& data) const { + return t_Maybe_uint13.store_from(cb, data.nargs) + && t_Maybe_VmStack.store_from(cb, data.stack) + && t_VmSaveList.store_from(cb, data.save) + && t_Maybe_int16.store_from(cb, data.cp); +} + +bool VmControlData::cell_pack(Ref& cell_ref, const VmControlData::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmControlData::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return pp.open("vm_ctl_data") + && pp.field("nargs") + && t_Maybe_uint13.print_skip(pp, cs) + && pp.field("stack") + && t_Maybe_VmStack.print_skip(pp, cs) + && pp.field("save") + && t_VmSaveList.print_skip(pp, cs) + && pp.field("cp") + && t_Maybe_int16.print_skip(pp, cs) + && pp.close(); +} + +const VmControlData t_VmControlData; + +// +// code for type `VmCont` +// +constexpr char VmCont::cons_len[10]; +constexpr unsigned char VmCont::cons_tag[10]; + +int VmCont::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vmc_std: + return cs.have(2) ? vmc_std : -1; + case vmc_envelope: + return cs.have(2) ? vmc_envelope : -1; + case vmc_quit: + return cs.have(4) ? vmc_quit : -1; + case vmc_quit_exc: + return cs.have(4) ? vmc_quit_exc : -1; + case vmc_repeat: + return cs.prefetch_ulong(5) == 20 ? vmc_repeat : -1; + case vmc_until: + return cs.have(6) ? vmc_until : -1; + case vmc_again: + return cs.have(6) ? vmc_again : -1; + case vmc_while_cond: + return cs.have(6) ? vmc_while_cond : -1; + case vmc_while_body: + return cs.prefetch_ulong(6) == 0x33 ? vmc_while_body : -1; + case vmc_pushint: + return cs.have(4) ? vmc_pushint : -1; + } + return -1; +} + +bool VmCont::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vmc_std: + return cs.advance(2) + && t_VmControlData.skip(cs) + && cs.advance_ext(0x1001a); + case vmc_envelope: + return cs.advance(2) + && t_VmControlData.skip(cs) + && cs.advance_refs(1); + case vmc_quit: + return cs.advance(36); + case vmc_quit_exc: + return cs.advance(4); + case vmc_repeat: + return cs.advance_ext(0x20044); + case vmc_until: + return cs.advance_ext(0x20006); + case vmc_again: + return cs.advance_ext(0x10006); + case vmc_while_cond: + return cs.advance_ext(0x30006); + case vmc_while_body: + return cs.advance_ext(0x30006); + case vmc_pushint: + return cs.advance_ext(0x10024); + } + return false; +} + +bool VmCont::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case vmc_std: + return cs.advance(2) + && t_VmControlData.validate_skip(ops, cs, weak) + && t_VmCellSlice.validate_skip(ops, cs, weak); + case vmc_envelope: + return cs.advance(2) + && t_VmControlData.validate_skip(ops, cs, weak) + && validate_skip_ref(ops, cs, weak); + case vmc_quit: + return cs.advance(36); + case vmc_quit_exc: + return cs.advance(4); + case vmc_repeat: + return cs.fetch_ulong(5) == 20 + && cs.advance(63) + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak); + case vmc_until: + return cs.advance(6) + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak); + case vmc_again: + return cs.advance(6) + && validate_skip_ref(ops, cs, weak); + case vmc_while_cond: + return cs.advance(6) + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak); + case vmc_while_body: + return cs.fetch_ulong(6) == 0x33 + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak) + && validate_skip_ref(ops, cs, weak); + case vmc_pushint: + return cs.advance(36) + && validate_skip_ref(ops, cs, weak); + } + return false; +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_std& data) const { + return cs.fetch_ulong(2) == 0 + && t_VmControlData.fetch_to(cs, data.cdata) + && cs.fetch_subslice_ext_to(0x1001a, data.code); +} + +bool VmCont::unpack_vmc_std(vm::CellSlice& cs, Ref& cdata, Ref& code) const { + return cs.fetch_ulong(2) == 0 + && t_VmControlData.fetch_to(cs, cdata) + && cs.fetch_subslice_ext_to(0x1001a, code); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_std& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_std(Ref cell_ref, Ref& cdata, Ref& code) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_std(cs, cdata, code) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_envelope& data) const { + return cs.fetch_ulong(2) == 1 + && t_VmControlData.fetch_to(cs, data.cdata) + && cs.fetch_ref_to(data.next); +} + +bool VmCont::unpack_vmc_envelope(vm::CellSlice& cs, Ref& cdata, Ref& next) const { + return cs.fetch_ulong(2) == 1 + && t_VmControlData.fetch_to(cs, cdata) + && cs.fetch_ref_to(next); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_envelope& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_envelope(Ref cell_ref, Ref& cdata, Ref& next) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_envelope(cs, cdata, next) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_quit& data) const { + return cs.fetch_ulong(4) == 8 + && cs.fetch_int_to(32, data.exit_code); +} + +bool VmCont::unpack_vmc_quit(vm::CellSlice& cs, int& exit_code) const { + return cs.fetch_ulong(4) == 8 + && cs.fetch_int_to(32, exit_code); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_quit& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_quit(Ref cell_ref, int& exit_code) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_quit(cs, exit_code) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_quit_exc& data) const { + return cs.fetch_ulong(4) == 9; +} + +bool VmCont::unpack_vmc_quit_exc(vm::CellSlice& cs) const { + return cs.fetch_ulong(4) == 9; +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_quit_exc& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_quit_exc(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_quit_exc(cs) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_repeat& data) const { + return cs.fetch_ulong(5) == 20 + && cs.fetch_uint_to(63, data.count) + && cs.fetch_ref_to(data.body) + && cs.fetch_ref_to(data.after); +} + +bool VmCont::unpack_vmc_repeat(vm::CellSlice& cs, long long& count, Ref& body, Ref& after) const { + return cs.fetch_ulong(5) == 20 + && cs.fetch_uint_to(63, count) + && cs.fetch_ref_to(body) + && cs.fetch_ref_to(after); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_repeat& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_repeat(Ref cell_ref, long long& count, Ref& body, Ref& after) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_repeat(cs, count, body, after) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_until& data) const { + return cs.fetch_ulong(6) == 0x30 + && cs.fetch_ref_to(data.body) + && cs.fetch_ref_to(data.after); +} + +bool VmCont::unpack_vmc_until(vm::CellSlice& cs, Ref& body, Ref& after) const { + return cs.fetch_ulong(6) == 0x30 + && cs.fetch_ref_to(body) + && cs.fetch_ref_to(after); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_until& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_until(Ref cell_ref, Ref& body, Ref& after) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_until(cs, body, after) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_again& data) const { + return cs.fetch_ulong(6) == 0x31 + && cs.fetch_ref_to(data.body); +} + +bool VmCont::unpack_vmc_again(vm::CellSlice& cs, Ref& body) const { + return cs.fetch_ulong(6) == 0x31 + && cs.fetch_ref_to(body); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_again& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_again(Ref cell_ref, Ref& body) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_again(cs, body) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_while_cond& data) const { + return cs.fetch_ulong(6) == 0x32 + && cs.fetch_ref_to(data.cond) + && cs.fetch_ref_to(data.body) + && cs.fetch_ref_to(data.after); +} + +bool VmCont::unpack_vmc_while_cond(vm::CellSlice& cs, Ref& cond, Ref& body, Ref& after) const { + return cs.fetch_ulong(6) == 0x32 + && cs.fetch_ref_to(cond) + && cs.fetch_ref_to(body) + && cs.fetch_ref_to(after); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_while_cond& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_while_cond(Ref cell_ref, Ref& cond, Ref& body, Ref& after) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_while_cond(cs, cond, body, after) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_while_body& data) const { + return cs.fetch_ulong(6) == 0x33 + && cs.fetch_ref_to(data.cond) + && cs.fetch_ref_to(data.body) + && cs.fetch_ref_to(data.after); +} + +bool VmCont::unpack_vmc_while_body(vm::CellSlice& cs, Ref& cond, Ref& body, Ref& after) const { + return cs.fetch_ulong(6) == 0x33 + && cs.fetch_ref_to(cond) + && cs.fetch_ref_to(body) + && cs.fetch_ref_to(after); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_while_body& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_while_body(Ref cell_ref, Ref& cond, Ref& body, Ref& after) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_while_body(cs, cond, body, after) && cs.empty_ext(); +} + +bool VmCont::unpack(vm::CellSlice& cs, VmCont::Record_vmc_pushint& data) const { + return cs.fetch_ulong(4) == 15 + && cs.fetch_int_to(32, data.value) + && cs.fetch_ref_to(data.next); +} + +bool VmCont::unpack_vmc_pushint(vm::CellSlice& cs, int& value, Ref& next) const { + return cs.fetch_ulong(4) == 15 + && cs.fetch_int_to(32, value) + && cs.fetch_ref_to(next); +} + +bool VmCont::cell_unpack(Ref cell_ref, VmCont::Record_vmc_pushint& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool VmCont::cell_unpack_vmc_pushint(Ref cell_ref, int& value, Ref& next) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_vmc_pushint(cs, value, next) && cs.empty_ext(); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_std& data) const { + return cb.store_long_bool(0, 2) + && t_VmControlData.store_from(cb, data.cdata) + && cb.append_cellslice_chk(data.code, 0x1001a); +} + +bool VmCont::pack_vmc_std(vm::CellBuilder& cb, Ref cdata, Ref code) const { + return cb.store_long_bool(0, 2) + && t_VmControlData.store_from(cb, cdata) + && cb.append_cellslice_chk(code, 0x1001a); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_std& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_std(Ref& cell_ref, Ref cdata, Ref code) const { + vm::CellBuilder cb; + return pack_vmc_std(cb, std::move(cdata), std::move(code)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_envelope& data) const { + return cb.store_long_bool(1, 2) + && t_VmControlData.store_from(cb, data.cdata) + && cb.store_ref_bool(data.next); +} + +bool VmCont::pack_vmc_envelope(vm::CellBuilder& cb, Ref cdata, Ref next) const { + return cb.store_long_bool(1, 2) + && t_VmControlData.store_from(cb, cdata) + && cb.store_ref_bool(next); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_envelope& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_envelope(Ref& cell_ref, Ref cdata, Ref next) const { + vm::CellBuilder cb; + return pack_vmc_envelope(cb, std::move(cdata), std::move(next)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_quit& data) const { + return cb.store_long_bool(8, 4) + && cb.store_long_rchk_bool(data.exit_code, 32); +} + +bool VmCont::pack_vmc_quit(vm::CellBuilder& cb, int exit_code) const { + return cb.store_long_bool(8, 4) + && cb.store_long_rchk_bool(exit_code, 32); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_quit& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_quit(Ref& cell_ref, int exit_code) const { + vm::CellBuilder cb; + return pack_vmc_quit(cb, exit_code) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_quit_exc& data) const { + return cb.store_long_bool(9, 4); +} + +bool VmCont::pack_vmc_quit_exc(vm::CellBuilder& cb) const { + return cb.store_long_bool(9, 4); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_quit_exc& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_quit_exc(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_vmc_quit_exc(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_repeat& data) const { + return cb.store_long_bool(20, 5) + && cb.store_ulong_rchk_bool(data.count, 63) + && cb.store_ref_bool(data.body) + && cb.store_ref_bool(data.after); +} + +bool VmCont::pack_vmc_repeat(vm::CellBuilder& cb, long long count, Ref body, Ref after) const { + return cb.store_long_bool(20, 5) + && cb.store_ulong_rchk_bool(count, 63) + && cb.store_ref_bool(body) + && cb.store_ref_bool(after); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_repeat& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_repeat(Ref& cell_ref, long long count, Ref body, Ref after) const { + vm::CellBuilder cb; + return pack_vmc_repeat(cb, count, std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_until& data) const { + return cb.store_long_bool(0x30, 6) + && cb.store_ref_bool(data.body) + && cb.store_ref_bool(data.after); +} + +bool VmCont::pack_vmc_until(vm::CellBuilder& cb, Ref body, Ref after) const { + return cb.store_long_bool(0x30, 6) + && cb.store_ref_bool(body) + && cb.store_ref_bool(after); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_until& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_until(Ref& cell_ref, Ref body, Ref after) const { + vm::CellBuilder cb; + return pack_vmc_until(cb, std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_again& data) const { + return cb.store_long_bool(0x31, 6) + && cb.store_ref_bool(data.body); +} + +bool VmCont::pack_vmc_again(vm::CellBuilder& cb, Ref body) const { + return cb.store_long_bool(0x31, 6) + && cb.store_ref_bool(body); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_again& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_again(Ref& cell_ref, Ref body) const { + vm::CellBuilder cb; + return pack_vmc_again(cb, std::move(body)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_while_cond& data) const { + return cb.store_long_bool(0x32, 6) + && cb.store_ref_bool(data.cond) + && cb.store_ref_bool(data.body) + && cb.store_ref_bool(data.after); +} + +bool VmCont::pack_vmc_while_cond(vm::CellBuilder& cb, Ref cond, Ref body, Ref after) const { + return cb.store_long_bool(0x32, 6) + && cb.store_ref_bool(cond) + && cb.store_ref_bool(body) + && cb.store_ref_bool(after); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_while_cond& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_while_cond(Ref& cell_ref, Ref cond, Ref body, Ref after) const { + vm::CellBuilder cb; + return pack_vmc_while_cond(cb, std::move(cond), std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_while_body& data) const { + return cb.store_long_bool(0x33, 6) + && cb.store_ref_bool(data.cond) + && cb.store_ref_bool(data.body) + && cb.store_ref_bool(data.after); +} + +bool VmCont::pack_vmc_while_body(vm::CellBuilder& cb, Ref cond, Ref body, Ref after) const { + return cb.store_long_bool(0x33, 6) + && cb.store_ref_bool(cond) + && cb.store_ref_bool(body) + && cb.store_ref_bool(after); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_while_body& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_while_body(Ref& cell_ref, Ref cond, Ref body, Ref after) const { + vm::CellBuilder cb; + return pack_vmc_while_body(cb, std::move(cond), std::move(body), std::move(after)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::pack(vm::CellBuilder& cb, const VmCont::Record_vmc_pushint& data) const { + return cb.store_long_bool(15, 4) + && cb.store_long_rchk_bool(data.value, 32) + && cb.store_ref_bool(data.next); +} + +bool VmCont::pack_vmc_pushint(vm::CellBuilder& cb, int value, Ref next) const { + return cb.store_long_bool(15, 4) + && cb.store_long_rchk_bool(value, 32) + && cb.store_ref_bool(next); +} + +bool VmCont::cell_pack(Ref& cell_ref, const VmCont::Record_vmc_pushint& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::cell_pack_vmc_pushint(Ref& cell_ref, int value, Ref next) const { + vm::CellBuilder cb; + return pack_vmc_pushint(cb, value, std::move(next)) && std::move(cb).finalize_to(cell_ref); +} + +bool VmCont::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case vmc_std: + return cs.advance(2) + && pp.open("vmc_std") + && pp.field("cdata") + && t_VmControlData.print_skip(pp, cs) + && pp.field("code") + && t_VmCellSlice.print_skip(pp, cs) + && pp.close(); + case vmc_envelope: + return cs.advance(2) + && pp.open("vmc_envelope") + && pp.field("cdata") + && t_VmControlData.print_skip(pp, cs) + && pp.field("next") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vmc_quit: + return cs.advance(4) + && pp.open("vmc_quit") + && pp.fetch_int_field(cs, 32, "exit_code") + && pp.close(); + case vmc_quit_exc: + return cs.advance(4) + && pp.cons("vmc_quit_exc"); + case vmc_repeat: + return cs.fetch_ulong(5) == 20 + && pp.open("vmc_repeat") + && pp.fetch_uint_field(cs, 63, "count") + && pp.field("body") + && print_ref(pp, cs.fetch_ref()) + && pp.field("after") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vmc_until: + return cs.advance(6) + && pp.open("vmc_until") + && pp.field("body") + && print_ref(pp, cs.fetch_ref()) + && pp.field("after") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vmc_again: + return cs.advance(6) + && pp.open("vmc_again") + && pp.field("body") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vmc_while_cond: + return cs.advance(6) + && pp.open("vmc_while_cond") + && pp.field("cond") + && print_ref(pp, cs.fetch_ref()) + && pp.field("body") + && print_ref(pp, cs.fetch_ref()) + && pp.field("after") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vmc_while_body: + return cs.fetch_ulong(6) == 0x33 + && pp.open("vmc_while_body") + && pp.field("cond") + && print_ref(pp, cs.fetch_ref()) + && pp.field("body") + && print_ref(pp, cs.fetch_ref()) + && pp.field("after") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + case vmc_pushint: + return cs.advance(4) + && pp.open("vmc_pushint") + && pp.fetch_int_field(cs, 32, "value") + && pp.field("next") + && print_ref(pp, cs.fetch_ref()) + && pp.close(); + } + return pp.fail("unknown constructor for VmCont"); +} + +const VmCont t_VmCont; + +// +// code for type `DNS_RecordSet` +// + +int DNS_RecordSet::check_tag(const vm::CellSlice& cs) const { + return cons1; +} + +bool DNS_RecordSet::skip(vm::CellSlice& cs) const { + return t_HashmapE_16_Ref_DNSRecord.skip(cs); +} + +bool DNS_RecordSet::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_HashmapE_16_Ref_DNSRecord.validate_skip(ops, cs, weak); +} + +bool DNS_RecordSet::unpack(vm::CellSlice& cs, DNS_RecordSet::Record& data) const { + return t_HashmapE_16_Ref_DNSRecord.fetch_to(cs, data.x); +} + +bool DNS_RecordSet::unpack_cons1(vm::CellSlice& cs, Ref& x) const { + return t_HashmapE_16_Ref_DNSRecord.fetch_to(cs, x); +} + +bool DNS_RecordSet::cell_unpack(Ref cell_ref, DNS_RecordSet::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool DNS_RecordSet::cell_unpack_cons1(Ref cell_ref, Ref& x) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cons1(cs, x) && cs.empty_ext(); +} + +bool DNS_RecordSet::pack(vm::CellBuilder& cb, const DNS_RecordSet::Record& data) const { + return t_HashmapE_16_Ref_DNSRecord.store_from(cb, data.x); +} + +bool DNS_RecordSet::pack_cons1(vm::CellBuilder& cb, Ref x) const { + return t_HashmapE_16_Ref_DNSRecord.store_from(cb, x); +} + +bool DNS_RecordSet::cell_pack(Ref& cell_ref, const DNS_RecordSet::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool DNS_RecordSet::cell_pack_cons1(Ref& cell_ref, Ref x) const { + vm::CellBuilder cb; + return pack_cons1(cb, std::move(x)) && std::move(cb).finalize_to(cell_ref); +} + +bool DNS_RecordSet::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return pp.open() + && pp.field() + && t_HashmapE_16_Ref_DNSRecord.print_skip(pp, cs) + && pp.close(); +} + +const DNS_RecordSet t_DNS_RecordSet; + +// +// code for type `TextChunkRef` +// + +int TextChunkRef::get_tag(const vm::CellSlice& cs) const { + // distinguish by parameter `m_` using 2 1 1 1 + return m_ ? chunk_ref : chunk_ref_empty; +} + +int TextChunkRef::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case chunk_ref: + return chunk_ref; + case chunk_ref_empty: + return chunk_ref_empty; + } + return -1; +} + +bool TextChunkRef::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case chunk_ref: { + int n; + return add_r1(n, 1, m_) + && cs.advance_refs(1); + } + case chunk_ref_empty: + return m_ == 0; + } + return false; +} + +bool TextChunkRef::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case chunk_ref: { + int n; + return add_r1(n, 1, m_) + && TextChunks{n + 1}.validate_skip_ref(ops, cs, weak); + } + case chunk_ref_empty: + return m_ == 0; + } + return false; +} + +bool TextChunkRef::unpack(vm::CellSlice& cs, TextChunkRef::Record_chunk_ref& data) const { + return add_r1(data.n, 1, m_) + && cs.fetch_ref_to(data.ref); +} + +bool TextChunkRef::unpack_chunk_ref(vm::CellSlice& cs, int& n, Ref& ref) const { + return add_r1(n, 1, m_) + && cs.fetch_ref_to(ref); +} + +bool TextChunkRef::cell_unpack(Ref cell_ref, TextChunkRef::Record_chunk_ref& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool TextChunkRef::cell_unpack_chunk_ref(Ref cell_ref, int& n, Ref& ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_chunk_ref(cs, n, ref) && cs.empty_ext(); +} + +bool TextChunkRef::unpack(vm::CellSlice& cs, TextChunkRef::Record_chunk_ref_empty& data) const { + return m_ == 0; +} + +bool TextChunkRef::unpack_chunk_ref_empty(vm::CellSlice& cs) const { + return m_ == 0; +} + +bool TextChunkRef::cell_unpack(Ref cell_ref, TextChunkRef::Record_chunk_ref_empty& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool TextChunkRef::cell_unpack_chunk_ref_empty(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_chunk_ref_empty(cs) && cs.empty_ext(); +} + +bool TextChunkRef::pack(vm::CellBuilder& cb, const TextChunkRef::Record_chunk_ref& data) const { + int n; + return add_r1(n, 1, m_) + && cb.store_ref_bool(data.ref); +} + +bool TextChunkRef::pack_chunk_ref(vm::CellBuilder& cb, Ref ref) const { + int n; + return add_r1(n, 1, m_) + && cb.store_ref_bool(ref); +} + +bool TextChunkRef::cell_pack(Ref& cell_ref, const TextChunkRef::Record_chunk_ref& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunkRef::cell_pack_chunk_ref(Ref& cell_ref, Ref ref) const { + vm::CellBuilder cb; + return pack_chunk_ref(cb, std::move(ref)) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunkRef::pack(vm::CellBuilder& cb, const TextChunkRef::Record_chunk_ref_empty& data) const { + return m_ == 0; +} + +bool TextChunkRef::pack_chunk_ref_empty(vm::CellBuilder& cb) const { + return m_ == 0; +} + +bool TextChunkRef::cell_pack(Ref& cell_ref, const TextChunkRef::Record_chunk_ref_empty& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunkRef::cell_pack_chunk_ref_empty(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_chunk_ref_empty(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunkRef::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case chunk_ref: { + int n; + return pp.open("chunk_ref") + && add_r1(n, 1, m_) + && pp.field("ref") + && TextChunks{n + 1}.print_ref(pp, cs.fetch_ref()) + && pp.close(); + } + case chunk_ref_empty: + return pp.cons("chunk_ref_empty") + && m_ == 0; + } + return pp.fail("unknown constructor for TextChunkRef"); +} + + +// +// code for type `TextChunks` +// + +int TextChunks::get_tag(const vm::CellSlice& cs) const { + // distinguish by parameter `m_` using 2 1 1 1 + return m_ ? text_chunk : text_chunk_empty; +} + +int TextChunks::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case text_chunk: + return text_chunk; + case text_chunk_empty: + return text_chunk_empty; + } + return -1; +} + +bool TextChunks::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case text_chunk: { + int n, len; + return add_r1(n, 1, m_) + && cs.fetch_uint_to(8, len) + && cs.advance(8 * len) + && TextChunkRef{n}.skip(cs); + } + case text_chunk_empty: + return m_ == 0; + } + return false; +} + +bool TextChunks::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case text_chunk: { + int n, len; + return add_r1(n, 1, m_) + && cs.fetch_uint_to(8, len) + && cs.advance(8 * len) + && TextChunkRef{n}.validate_skip(ops, cs, weak); + } + case text_chunk_empty: + return m_ == 0; + } + return false; +} + +bool TextChunks::unpack(vm::CellSlice& cs, TextChunks::Record_text_chunk& data) const { + return add_r1(data.n, 1, m_) + && cs.fetch_uint_to(8, data.len) + && cs.fetch_bitstring_to(8 * data.len, data.data) + && TextChunkRef{data.n}.fetch_to(cs, data.next); +} + +bool TextChunks::cell_unpack(Ref cell_ref, TextChunks::Record_text_chunk& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool TextChunks::unpack(vm::CellSlice& cs, TextChunks::Record_text_chunk_empty& data) const { + return m_ == 0; +} + +bool TextChunks::unpack_text_chunk_empty(vm::CellSlice& cs) const { + return m_ == 0; +} + +bool TextChunks::cell_unpack(Ref cell_ref, TextChunks::Record_text_chunk_empty& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool TextChunks::cell_unpack_text_chunk_empty(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_text_chunk_empty(cs) && cs.empty_ext(); +} + +bool TextChunks::pack(vm::CellBuilder& cb, const TextChunks::Record_text_chunk& data) const { + int n; + return add_r1(n, 1, m_) + && cb.store_ulong_rchk_bool(data.len, 8) + && cb.append_bitstring_chk(data.data, 8 * data.len) + && TextChunkRef{n}.store_from(cb, data.next); +} + +bool TextChunks::cell_pack(Ref& cell_ref, const TextChunks::Record_text_chunk& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunks::pack(vm::CellBuilder& cb, const TextChunks::Record_text_chunk_empty& data) const { + return m_ == 0; +} + +bool TextChunks::pack_text_chunk_empty(vm::CellBuilder& cb) const { + return m_ == 0; +} + +bool TextChunks::cell_pack(Ref& cell_ref, const TextChunks::Record_text_chunk_empty& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunks::cell_pack_text_chunk_empty(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_text_chunk_empty(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool TextChunks::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case text_chunk: { + int n, len; + return pp.open("text_chunk") + && add_r1(n, 1, m_) + && cs.fetch_uint_to(8, len) + && pp.field_int(len, "len") + && pp.fetch_bits_field(cs, 8 * len, "data") + && pp.field("next") + && TextChunkRef{n}.print_skip(pp, cs) + && pp.close(); + } + case text_chunk_empty: + return pp.cons("text_chunk_empty") + && m_ == 0; + } + return pp.fail("unknown constructor for TextChunks"); +} + + +// +// code for type `Text` +// + +int Text::check_tag(const vm::CellSlice& cs) const { + return text; +} + +bool Text::skip(vm::CellSlice& cs) const { + int chunks; + return cs.fetch_uint_to(8, chunks) + && TextChunks{chunks}.skip(cs); +} + +bool Text::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + int chunks; + return cs.fetch_uint_to(8, chunks) + && TextChunks{chunks}.validate_skip(ops, cs, weak); +} + +bool Text::unpack(vm::CellSlice& cs, Text::Record& data) const { + return cs.fetch_uint_to(8, data.chunks) + && TextChunks{data.chunks}.fetch_to(cs, data.rest); +} + +bool Text::unpack_text(vm::CellSlice& cs, int& chunks, Ref& rest) const { + return cs.fetch_uint_to(8, chunks) + && TextChunks{chunks}.fetch_to(cs, rest); +} + +bool Text::cell_unpack(Ref cell_ref, Text::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool Text::cell_unpack_text(Ref cell_ref, int& chunks, Ref& rest) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_text(cs, chunks, rest) && cs.empty_ext(); +} + +bool Text::pack(vm::CellBuilder& cb, const Text::Record& data) const { + return cb.store_ulong_rchk_bool(data.chunks, 8) + && TextChunks{data.chunks}.store_from(cb, data.rest); +} + +bool Text::pack_text(vm::CellBuilder& cb, int chunks, Ref rest) const { + return cb.store_ulong_rchk_bool(chunks, 8) + && TextChunks{chunks}.store_from(cb, rest); +} + +bool Text::cell_pack(Ref& cell_ref, const Text::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool Text::cell_pack_text(Ref& cell_ref, int chunks, Ref rest) const { + vm::CellBuilder cb; + return pack_text(cb, chunks, std::move(rest)) && std::move(cb).finalize_to(cell_ref); +} + +bool Text::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + int chunks; + return pp.open("text") + && cs.fetch_uint_to(8, chunks) + && pp.field_int(chunks, "chunks") + && pp.field("rest") + && TextChunks{chunks}.print_skip(pp, cs) + && pp.close(); +} + +const Text t_Text; + +// +// code for type `ProtoList` +// + +int ProtoList::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case proto_list_nil: + return cs.have(1) ? proto_list_nil : -1; + case proto_list_next: + return cs.have(1) ? proto_list_next : -1; + } + return -1; +} + +bool ProtoList::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case proto_list_nil: + return cs.advance(1); + case proto_list_next: + return cs.advance(17) + && skip(cs); + } + return false; +} + +bool ProtoList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case proto_list_nil: + return cs.advance(1); + case proto_list_next: + return cs.advance(1) + && t_Protocol.validate_skip(ops, cs, weak) + && validate_skip(ops, cs, weak); + } + return false; +} + +bool ProtoList::unpack(vm::CellSlice& cs, ProtoList::Record_proto_list_nil& data) const { + return cs.fetch_ulong(1) == 0; +} + +bool ProtoList::unpack_proto_list_nil(vm::CellSlice& cs) const { + return cs.fetch_ulong(1) == 0; +} + +bool ProtoList::cell_unpack(Ref cell_ref, ProtoList::Record_proto_list_nil& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool ProtoList::cell_unpack_proto_list_nil(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_proto_list_nil(cs) && cs.empty_ext(); +} + +bool ProtoList::unpack(vm::CellSlice& cs, ProtoList::Record_proto_list_next& data) const { + return cs.fetch_ulong(1) == 1 + && t_Protocol.fetch_enum_to(cs, data.head) + && fetch_to(cs, data.tail); +} + +bool ProtoList::unpack_proto_list_next(vm::CellSlice& cs, char& head, Ref& tail) const { + return cs.fetch_ulong(1) == 1 + && t_Protocol.fetch_enum_to(cs, head) + && fetch_to(cs, tail); +} + +bool ProtoList::cell_unpack(Ref cell_ref, ProtoList::Record_proto_list_next& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool ProtoList::cell_unpack_proto_list_next(Ref cell_ref, char& head, Ref& tail) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_proto_list_next(cs, head, tail) && cs.empty_ext(); +} + +bool ProtoList::pack(vm::CellBuilder& cb, const ProtoList::Record_proto_list_nil& data) const { + return cb.store_long_bool(0, 1); +} + +bool ProtoList::pack_proto_list_nil(vm::CellBuilder& cb) const { + return cb.store_long_bool(0, 1); +} + +bool ProtoList::cell_pack(Ref& cell_ref, const ProtoList::Record_proto_list_nil& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool ProtoList::cell_pack_proto_list_nil(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_proto_list_nil(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool ProtoList::pack(vm::CellBuilder& cb, const ProtoList::Record_proto_list_next& data) const { + return cb.store_long_bool(1, 1) + && t_Protocol.store_enum_from(cb, data.head) + && store_from(cb, data.tail); +} + +bool ProtoList::pack_proto_list_next(vm::CellBuilder& cb, char head, Ref tail) const { + return cb.store_long_bool(1, 1) + && t_Protocol.store_enum_from(cb, head) + && store_from(cb, tail); +} + +bool ProtoList::cell_pack(Ref& cell_ref, const ProtoList::Record_proto_list_next& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool ProtoList::cell_pack_proto_list_next(Ref& cell_ref, char head, Ref tail) const { + vm::CellBuilder cb; + return pack_proto_list_next(cb, head, std::move(tail)) && std::move(cb).finalize_to(cell_ref); +} + +bool ProtoList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case proto_list_nil: + return cs.advance(1) + && pp.cons("proto_list_nil"); + case proto_list_next: + return cs.advance(1) + && pp.open("proto_list_next") + && pp.field("head") + && t_Protocol.print_skip(pp, cs) + && pp.field("tail") + && print_skip(pp, cs) + && pp.close(); + } + return pp.fail("unknown constructor for ProtoList"); +} + +const ProtoList t_ProtoList; + +// +// code for type `Protocol` +// +constexpr unsigned short Protocol::cons_tag[1]; + +int Protocol::check_tag(const vm::CellSlice& cs) const { + return cs.prefetch_ulong(16) == 0x4854 ? proto_http : -1; +} + +bool Protocol::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.fetch_ulong(16) == 0x4854; +} + +bool Protocol::fetch_enum_to(vm::CellSlice& cs, char& value) const { + value = (cs.fetch_ulong(16) == 0x4854) ? 0 : -1; + return !value; +} + +bool Protocol::store_enum_from(vm::CellBuilder& cb, int value) const { + return !value && cb.store_long_bool(0x4854, 16); +} + +bool Protocol::unpack(vm::CellSlice& cs, Protocol::Record& data) const { + return cs.fetch_ulong(16) == 0x4854; +} + +bool Protocol::unpack_proto_http(vm::CellSlice& cs) const { + return cs.fetch_ulong(16) == 0x4854; +} + +bool Protocol::cell_unpack(Ref cell_ref, Protocol::Record& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool Protocol::cell_unpack_proto_http(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_proto_http(cs) && cs.empty_ext(); +} + +bool Protocol::pack(vm::CellBuilder& cb, const Protocol::Record& data) const { + return cb.store_long_bool(0x4854, 16); +} + +bool Protocol::pack_proto_http(vm::CellBuilder& cb) const { + return cb.store_long_bool(0x4854, 16); +} + +bool Protocol::cell_pack(Ref& cell_ref, const Protocol::Record& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool Protocol::cell_pack_proto_http(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_proto_http(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool Protocol::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + return cs.fetch_ulong(16) == 0x4854 + && pp.cons("proto_http"); +} + +const Protocol t_Protocol; + +// +// code for type `DNSRecord` +// +constexpr unsigned short DNSRecord::cons_tag[4]; + +int DNSRecord::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case dns_text: + return cs.prefetch_ulong(16) == 0x1eda ? dns_text : -1; + case dns_next_resolver: + return cs.prefetch_ulong(16) == 0xba93 ? dns_next_resolver : -1; + case dns_adnl_address: + return cs.prefetch_ulong(16) == 0xad01 ? dns_adnl_address : -1; + case dns_smc_address: + return cs.prefetch_ulong(16) == 0x9fd3 ? dns_smc_address : -1; + } + return -1; +} + +bool DNSRecord::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case dns_text: + return cs.advance(16) + && t_Text.skip(cs); + case dns_next_resolver: + return cs.advance(16) + && t_MsgAddressInt.skip(cs); + case dns_adnl_address: { + int flags; + return cs.advance(272) + && cs.fetch_uint_to(8, flags) + && flags <= 1 + && (!(flags & 1) || t_ProtoList.skip(cs)); + } + case dns_smc_address: { + int flags; + return cs.advance(16) + && t_MsgAddressInt.skip(cs) + && cs.fetch_uint_to(8, flags) + && flags <= 1 + && (!(flags & 1) || t_SmcCapList.skip(cs)); + } + } + return false; +} + +bool DNSRecord::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case dns_text: + return cs.fetch_ulong(16) == 0x1eda + && t_Text.validate_skip(ops, cs, weak); + case dns_next_resolver: + return cs.fetch_ulong(16) == 0xba93 + && t_MsgAddressInt.validate_skip(ops, cs, weak); + case dns_adnl_address: { + int flags; + return cs.fetch_ulong(16) == 0xad01 + && cs.advance(256) + && cs.fetch_uint_to(8, flags) + && flags <= 1 + && (!(flags & 1) || t_ProtoList.validate_skip(ops, cs, weak)); + } + case dns_smc_address: { + int flags; + return cs.fetch_ulong(16) == 0x9fd3 + && t_MsgAddressInt.validate_skip(ops, cs, weak) + && cs.fetch_uint_to(8, flags) + && flags <= 1 + && (!(flags & 1) || t_SmcCapList.validate_skip(ops, cs, weak)); + } + } + return false; +} + +bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_text& data) const { + return cs.fetch_ulong(16) == 0x1eda + && t_Text.fetch_to(cs, data.x); +} + +bool DNSRecord::unpack_dns_text(vm::CellSlice& cs, Ref& x) const { + return cs.fetch_ulong(16) == 0x1eda + && t_Text.fetch_to(cs, x); +} + +bool DNSRecord::cell_unpack(Ref cell_ref, DNSRecord::Record_dns_text& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool DNSRecord::cell_unpack_dns_text(Ref cell_ref, Ref& x) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_dns_text(cs, x) && cs.empty_ext(); +} + +bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_next_resolver& data) const { + return cs.fetch_ulong(16) == 0xba93 + && t_MsgAddressInt.fetch_to(cs, data.resolver); +} + +bool DNSRecord::unpack_dns_next_resolver(vm::CellSlice& cs, Ref& resolver) const { + return cs.fetch_ulong(16) == 0xba93 + && t_MsgAddressInt.fetch_to(cs, resolver); +} + +bool DNSRecord::cell_unpack(Ref cell_ref, DNSRecord::Record_dns_next_resolver& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool DNSRecord::cell_unpack_dns_next_resolver(Ref cell_ref, Ref& resolver) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_dns_next_resolver(cs, resolver) && cs.empty_ext(); +} + +bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_adnl_address& data) const { + return cs.fetch_ulong(16) == 0xad01 + && cs.fetch_bits_to(data.adnl_addr.bits(), 256) + && cs.fetch_uint_to(8, data.flags) + && data.flags <= 1 + && (!(data.flags & 1) || t_ProtoList.fetch_to(cs, data.proto_list)); +} + +bool DNSRecord::unpack_dns_adnl_address(vm::CellSlice& cs, td::BitArray<256>& adnl_addr, int& flags, Ref& proto_list) const { + return cs.fetch_ulong(16) == 0xad01 + && cs.fetch_bits_to(adnl_addr.bits(), 256) + && cs.fetch_uint_to(8, flags) + && flags <= 1 + && (!(flags & 1) || t_ProtoList.fetch_to(cs, proto_list)); +} + +bool DNSRecord::cell_unpack(Ref cell_ref, DNSRecord::Record_dns_adnl_address& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool DNSRecord::cell_unpack_dns_adnl_address(Ref cell_ref, td::BitArray<256>& adnl_addr, int& flags, Ref& proto_list) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_dns_adnl_address(cs, adnl_addr, flags, proto_list) && cs.empty_ext(); +} + +bool DNSRecord::unpack(vm::CellSlice& cs, DNSRecord::Record_dns_smc_address& data) const { + return cs.fetch_ulong(16) == 0x9fd3 + && t_MsgAddressInt.fetch_to(cs, data.smc_addr) + && cs.fetch_uint_to(8, data.flags) + && data.flags <= 1 + && (!(data.flags & 1) || t_SmcCapList.fetch_to(cs, data.cap_list)); +} + +bool DNSRecord::unpack_dns_smc_address(vm::CellSlice& cs, Ref& smc_addr, int& flags, Ref& cap_list) const { + return cs.fetch_ulong(16) == 0x9fd3 + && t_MsgAddressInt.fetch_to(cs, smc_addr) + && cs.fetch_uint_to(8, flags) + && flags <= 1 + && (!(flags & 1) || t_SmcCapList.fetch_to(cs, cap_list)); +} + +bool DNSRecord::cell_unpack(Ref cell_ref, DNSRecord::Record_dns_smc_address& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool DNSRecord::cell_unpack_dns_smc_address(Ref cell_ref, Ref& smc_addr, int& flags, Ref& cap_list) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_dns_smc_address(cs, smc_addr, flags, cap_list) && cs.empty_ext(); +} + +bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_text& data) const { + return cb.store_long_bool(0x1eda, 16) + && t_Text.store_from(cb, data.x); +} + +bool DNSRecord::pack_dns_text(vm::CellBuilder& cb, Ref x) const { + return cb.store_long_bool(0x1eda, 16) + && t_Text.store_from(cb, x); +} + +bool DNSRecord::cell_pack(Ref& cell_ref, const DNSRecord::Record_dns_text& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::cell_pack_dns_text(Ref& cell_ref, Ref x) const { + vm::CellBuilder cb; + return pack_dns_text(cb, std::move(x)) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_next_resolver& data) const { + return cb.store_long_bool(0xba93, 16) + && t_MsgAddressInt.store_from(cb, data.resolver); +} + +bool DNSRecord::pack_dns_next_resolver(vm::CellBuilder& cb, Ref resolver) const { + return cb.store_long_bool(0xba93, 16) + && t_MsgAddressInt.store_from(cb, resolver); +} + +bool DNSRecord::cell_pack(Ref& cell_ref, const DNSRecord::Record_dns_next_resolver& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::cell_pack_dns_next_resolver(Ref& cell_ref, Ref resolver) const { + vm::CellBuilder cb; + return pack_dns_next_resolver(cb, std::move(resolver)) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_adnl_address& data) const { + return cb.store_long_bool(0xad01, 16) + && cb.store_bits_bool(data.adnl_addr.cbits(), 256) + && cb.store_ulong_rchk_bool(data.flags, 8) + && data.flags <= 1 + && (!(data.flags & 1) || t_ProtoList.store_from(cb, data.proto_list)); +} + +bool DNSRecord::pack_dns_adnl_address(vm::CellBuilder& cb, td::BitArray<256> adnl_addr, int flags, Ref proto_list) const { + return cb.store_long_bool(0xad01, 16) + && cb.store_bits_bool(adnl_addr.cbits(), 256) + && cb.store_ulong_rchk_bool(flags, 8) + && flags <= 1 + && (!(flags & 1) || t_ProtoList.store_from(cb, proto_list)); +} + +bool DNSRecord::cell_pack(Ref& cell_ref, const DNSRecord::Record_dns_adnl_address& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::cell_pack_dns_adnl_address(Ref& cell_ref, td::BitArray<256> adnl_addr, int flags, Ref proto_list) const { + vm::CellBuilder cb; + return pack_dns_adnl_address(cb, adnl_addr, flags, std::move(proto_list)) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::pack(vm::CellBuilder& cb, const DNSRecord::Record_dns_smc_address& data) const { + return cb.store_long_bool(0x9fd3, 16) + && t_MsgAddressInt.store_from(cb, data.smc_addr) + && cb.store_ulong_rchk_bool(data.flags, 8) + && data.flags <= 1 + && (!(data.flags & 1) || t_SmcCapList.store_from(cb, data.cap_list)); +} + +bool DNSRecord::pack_dns_smc_address(vm::CellBuilder& cb, Ref smc_addr, int flags, Ref cap_list) const { + return cb.store_long_bool(0x9fd3, 16) + && t_MsgAddressInt.store_from(cb, smc_addr) + && cb.store_ulong_rchk_bool(flags, 8) + && flags <= 1 + && (!(flags & 1) || t_SmcCapList.store_from(cb, cap_list)); +} + +bool DNSRecord::cell_pack(Ref& cell_ref, const DNSRecord::Record_dns_smc_address& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::cell_pack_dns_smc_address(Ref& cell_ref, Ref smc_addr, int flags, Ref cap_list) const { + vm::CellBuilder cb; + return pack_dns_smc_address(cb, std::move(smc_addr), flags, std::move(cap_list)) && std::move(cb).finalize_to(cell_ref); +} + +bool DNSRecord::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case dns_text: + return cs.fetch_ulong(16) == 0x1eda + && pp.open("dns_text") + && pp.field() + && t_Text.print_skip(pp, cs) + && pp.close(); + case dns_next_resolver: + return cs.fetch_ulong(16) == 0xba93 + && pp.open("dns_next_resolver") + && pp.field("resolver") + && t_MsgAddressInt.print_skip(pp, cs) + && pp.close(); + case dns_adnl_address: { + int flags; + return cs.fetch_ulong(16) == 0xad01 + && pp.open("dns_adnl_address") + && pp.fetch_bits_field(cs, 256, "adnl_addr") + && cs.fetch_uint_to(8, flags) + && pp.field_int(flags, "flags") + && flags <= 1 + && (!(flags & 1) || (pp.field("proto_list") && t_ProtoList.print_skip(pp, cs))) + && pp.close(); + } + case dns_smc_address: { + int flags; + return cs.fetch_ulong(16) == 0x9fd3 + && pp.open("dns_smc_address") + && pp.field("smc_addr") + && t_MsgAddressInt.print_skip(pp, cs) + && cs.fetch_uint_to(8, flags) + && pp.field_int(flags, "flags") + && flags <= 1 + && (!(flags & 1) || (pp.field("cap_list") && t_SmcCapList.print_skip(pp, cs))) + && pp.close(); + } + } + return pp.fail("unknown constructor for DNSRecord"); +} + +const DNSRecord t_DNSRecord; + +// +// code for type `SmcCapList` +// + +int SmcCapList::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case cap_list_nil: + return cs.have(1) ? cap_list_nil : -1; + case cap_list_next: + return cs.have(1) ? cap_list_next : -1; + } + return -1; +} + +bool SmcCapList::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case cap_list_nil: + return cs.advance(1); + case cap_list_next: + return cs.advance(1) + && t_SmcCapability.skip(cs) + && skip(cs); + } + return false; +} + +bool SmcCapList::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case cap_list_nil: + return cs.advance(1); + case cap_list_next: + return cs.advance(1) + && t_SmcCapability.validate_skip(ops, cs, weak) + && validate_skip(ops, cs, weak); + } + return false; +} + +bool SmcCapList::unpack(vm::CellSlice& cs, SmcCapList::Record_cap_list_nil& data) const { + return cs.fetch_ulong(1) == 0; +} + +bool SmcCapList::unpack_cap_list_nil(vm::CellSlice& cs) const { + return cs.fetch_ulong(1) == 0; +} + +bool SmcCapList::cell_unpack(Ref cell_ref, SmcCapList::Record_cap_list_nil& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool SmcCapList::cell_unpack_cap_list_nil(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cap_list_nil(cs) && cs.empty_ext(); +} + +bool SmcCapList::unpack(vm::CellSlice& cs, SmcCapList::Record_cap_list_next& data) const { + return cs.fetch_ulong(1) == 1 + && t_SmcCapability.fetch_to(cs, data.head) + && fetch_to(cs, data.tail); +} + +bool SmcCapList::unpack_cap_list_next(vm::CellSlice& cs, Ref& head, Ref& tail) const { + return cs.fetch_ulong(1) == 1 + && t_SmcCapability.fetch_to(cs, head) + && fetch_to(cs, tail); +} + +bool SmcCapList::cell_unpack(Ref cell_ref, SmcCapList::Record_cap_list_next& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool SmcCapList::cell_unpack_cap_list_next(Ref cell_ref, Ref& head, Ref& tail) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cap_list_next(cs, head, tail) && cs.empty_ext(); +} + +bool SmcCapList::pack(vm::CellBuilder& cb, const SmcCapList::Record_cap_list_nil& data) const { + return cb.store_long_bool(0, 1); +} + +bool SmcCapList::pack_cap_list_nil(vm::CellBuilder& cb) const { + return cb.store_long_bool(0, 1); +} + +bool SmcCapList::cell_pack(Ref& cell_ref, const SmcCapList::Record_cap_list_nil& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapList::cell_pack_cap_list_nil(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_cap_list_nil(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapList::pack(vm::CellBuilder& cb, const SmcCapList::Record_cap_list_next& data) const { + return cb.store_long_bool(1, 1) + && t_SmcCapability.store_from(cb, data.head) + && store_from(cb, data.tail); +} + +bool SmcCapList::pack_cap_list_next(vm::CellBuilder& cb, Ref head, Ref tail) const { + return cb.store_long_bool(1, 1) + && t_SmcCapability.store_from(cb, head) + && store_from(cb, tail); +} + +bool SmcCapList::cell_pack(Ref& cell_ref, const SmcCapList::Record_cap_list_next& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapList::cell_pack_cap_list_next(Ref& cell_ref, Ref head, Ref tail) const { + vm::CellBuilder cb; + return pack_cap_list_next(cb, std::move(head), std::move(tail)) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapList::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case cap_list_nil: + return cs.advance(1) + && pp.cons("cap_list_nil"); + case cap_list_next: + return cs.advance(1) + && pp.open("cap_list_next") + && pp.field("head") + && t_SmcCapability.print_skip(pp, cs) + && pp.field("tail") + && print_skip(pp, cs) + && pp.close(); + } + return pp.fail("unknown constructor for SmcCapList"); +} + +const SmcCapList t_SmcCapList; + +// +// code for type `SmcCapability` +// +constexpr char SmcCapability::cons_len[4]; +constexpr unsigned short SmcCapability::cons_tag[4]; + +int SmcCapability::check_tag(const vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case cap_method_seqno: + return cs.prefetch_ulong(16) == 0x5371 ? cap_method_seqno : -1; + case cap_method_pubkey: + return cs.prefetch_ulong(16) == 0x71f4 ? cap_method_pubkey : -1; + case cap_is_wallet: + return cs.prefetch_ulong(16) == 0x2177 ? cap_is_wallet : -1; + case cap_name: + return cs.prefetch_ulong(8) == 0xff ? cap_name : -1; + } + return -1; +} + +bool SmcCapability::skip(vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case cap_method_seqno: + return cs.advance(16); + case cap_method_pubkey: + return cs.advance(16); + case cap_is_wallet: + return cs.advance(16); + case cap_name: + return cs.advance(8) + && t_Text.skip(cs); + } + return false; +} + +bool SmcCapability::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + switch (get_tag(cs)) { + case cap_method_seqno: + return cs.fetch_ulong(16) == 0x5371; + case cap_method_pubkey: + return cs.fetch_ulong(16) == 0x71f4; + case cap_is_wallet: + return cs.fetch_ulong(16) == 0x2177; + case cap_name: + return cs.fetch_ulong(8) == 0xff + && t_Text.validate_skip(ops, cs, weak); + } + return false; +} + +bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_method_seqno& data) const { + return cs.fetch_ulong(16) == 0x5371; +} + +bool SmcCapability::unpack_cap_method_seqno(vm::CellSlice& cs) const { + return cs.fetch_ulong(16) == 0x5371; +} + +bool SmcCapability::cell_unpack(Ref cell_ref, SmcCapability::Record_cap_method_seqno& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool SmcCapability::cell_unpack_cap_method_seqno(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cap_method_seqno(cs) && cs.empty_ext(); +} + +bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_method_pubkey& data) const { + return cs.fetch_ulong(16) == 0x71f4; +} + +bool SmcCapability::unpack_cap_method_pubkey(vm::CellSlice& cs) const { + return cs.fetch_ulong(16) == 0x71f4; +} + +bool SmcCapability::cell_unpack(Ref cell_ref, SmcCapability::Record_cap_method_pubkey& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool SmcCapability::cell_unpack_cap_method_pubkey(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cap_method_pubkey(cs) && cs.empty_ext(); +} + +bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_is_wallet& data) const { + return cs.fetch_ulong(16) == 0x2177; +} + +bool SmcCapability::unpack_cap_is_wallet(vm::CellSlice& cs) const { + return cs.fetch_ulong(16) == 0x2177; +} + +bool SmcCapability::cell_unpack(Ref cell_ref, SmcCapability::Record_cap_is_wallet& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool SmcCapability::cell_unpack_cap_is_wallet(Ref cell_ref) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cap_is_wallet(cs) && cs.empty_ext(); +} + +bool SmcCapability::unpack(vm::CellSlice& cs, SmcCapability::Record_cap_name& data) const { + return cs.fetch_ulong(8) == 0xff + && t_Text.fetch_to(cs, data.name); +} + +bool SmcCapability::unpack_cap_name(vm::CellSlice& cs, Ref& name) const { + return cs.fetch_ulong(8) == 0xff + && t_Text.fetch_to(cs, name); +} + +bool SmcCapability::cell_unpack(Ref cell_ref, SmcCapability::Record_cap_name& data) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack(cs, data) && cs.empty_ext(); +} + +bool SmcCapability::cell_unpack_cap_name(Ref cell_ref, Ref& name) const { + if (cell_ref.is_null()) { return false; } + auto cs = load_cell_slice(std::move(cell_ref)); + return unpack_cap_name(cs, name) && cs.empty_ext(); +} + +bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_method_seqno& data) const { + return cb.store_long_bool(0x5371, 16); +} + +bool SmcCapability::pack_cap_method_seqno(vm::CellBuilder& cb) const { + return cb.store_long_bool(0x5371, 16); +} + +bool SmcCapability::cell_pack(Ref& cell_ref, const SmcCapability::Record_cap_method_seqno& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::cell_pack_cap_method_seqno(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_cap_method_seqno(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_method_pubkey& data) const { + return cb.store_long_bool(0x71f4, 16); +} + +bool SmcCapability::pack_cap_method_pubkey(vm::CellBuilder& cb) const { + return cb.store_long_bool(0x71f4, 16); +} + +bool SmcCapability::cell_pack(Ref& cell_ref, const SmcCapability::Record_cap_method_pubkey& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::cell_pack_cap_method_pubkey(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_cap_method_pubkey(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_is_wallet& data) const { + return cb.store_long_bool(0x2177, 16); +} + +bool SmcCapability::pack_cap_is_wallet(vm::CellBuilder& cb) const { + return cb.store_long_bool(0x2177, 16); +} + +bool SmcCapability::cell_pack(Ref& cell_ref, const SmcCapability::Record_cap_is_wallet& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::cell_pack_cap_is_wallet(Ref& cell_ref) const { + vm::CellBuilder cb; + return pack_cap_is_wallet(cb) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::pack(vm::CellBuilder& cb, const SmcCapability::Record_cap_name& data) const { + return cb.store_long_bool(0xff, 8) + && t_Text.store_from(cb, data.name); +} + +bool SmcCapability::pack_cap_name(vm::CellBuilder& cb, Ref name) const { + return cb.store_long_bool(0xff, 8) + && t_Text.store_from(cb, name); +} + +bool SmcCapability::cell_pack(Ref& cell_ref, const SmcCapability::Record_cap_name& data) const { + vm::CellBuilder cb; + return pack(cb, data) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::cell_pack_cap_name(Ref& cell_ref, Ref name) const { + vm::CellBuilder cb; + return pack_cap_name(cb, std::move(name)) && std::move(cb).finalize_to(cell_ref); +} + +bool SmcCapability::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { + switch (get_tag(cs)) { + case cap_method_seqno: + return cs.fetch_ulong(16) == 0x5371 + && pp.cons("cap_method_seqno"); + case cap_method_pubkey: + return cs.fetch_ulong(16) == 0x71f4 + && pp.cons("cap_method_pubkey"); + case cap_is_wallet: + return cs.fetch_ulong(16) == 0x2177 + && pp.cons("cap_is_wallet"); + case cap_name: + return cs.fetch_ulong(8) == 0xff + && pp.open("cap_name") + && pp.field("name") + && t_Text.print_skip(pp, cs) + && pp.close(); + } + return pp.fail("unknown constructor for SmcCapability"); +} + +const SmcCapability t_SmcCapability; + // definitions of constant types used const NatWidth t_natwidth_1{1}; @@ -17368,12 +21103,13 @@ const NatWidth t_natwidth_6{6}; const NatWidth t_natwidth_8{8}; const MessageRelaxed t_MessageRelaxed_Any{t_Anything}; const RefT t_Ref_MessageRelaxed_Any{t_MessageRelaxed_Any}; +const NatWidth t_natwidth_7{7}; const NatLeq t_natleq_60{60}; const RefT t_Ref_OutMsgQueueInfo{t_OutMsgQueueInfo}; const RefT t_Ref_ShardAccounts{t_ShardAccounts}; const HashmapE t_HashmapE_256_LibDescr{256, t_LibDescr}; const Maybe t_Maybe_BlkMasterInfo{t_BlkMasterInfo}; -const RefT t_Ref_TYPE_1637{t_ShardStateUnsplit_aux}; +const RefT t_Ref_TYPE_1638{t_ShardStateUnsplit_aux}; const RefT t_Ref_McStateExtra{t_McStateExtra}; const Maybe t_Maybe_Ref_McStateExtra{t_Ref_McStateExtra}; const RefT t_Ref_ShardStateUnsplit{t_ShardStateUnsplit}; @@ -17392,8 +21128,8 @@ const RefT t_Ref_OutMsgDescr{t_OutMsgDescr}; const RefT t_Ref_ShardAccountBlocks{t_ShardAccountBlocks}; const RefT t_Ref_McBlockExtra{t_McBlockExtra}; const Maybe t_Maybe_Ref_McBlockExtra{t_Ref_McBlockExtra}; -const RefT t_Ref_TYPE_1647{t_ValueFlow_aux}; -const RefT t_Ref_TYPE_1648{t_ValueFlow_aux1}; +const RefT t_Ref_TYPE_1648{t_ValueFlow_aux}; +const RefT t_Ref_TYPE_1649{t_ValueFlow_aux1}; const NatWidth t_natwidth_3{3}; const BinTree t_BinTree_ShardDescr{t_ShardDescr}; const RefT t_Ref_BinTree_ShardDescr{t_BinTree_ShardDescr}; @@ -17403,13 +21139,14 @@ const Hashmap t_Hashmap_32_Ref_Cell{32, t_RefCell}; const RefT t_Ref_Hashmap_32_Ref_Cell{t_Hashmap_32_Ref_Cell}; const HashmapAugE t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt{32, t_KeyExtBlkRef, t_KeyMaxLt}; const HashmapE t_HashmapE_256_CreatorStats{256, t_CreatorStats}; +const HashmapAugE t_HashmapAugE_256_CreatorStats_uint32{256, t_CreatorStats, t_uint32}; const NatWidth t_natwidth_16{16}; const Maybe t_Maybe_ExtBlkRef{t_ExtBlkRef}; -const RefT t_Ref_TYPE_1665{t_McStateExtra_aux}; +const RefT t_Ref_TYPE_1666{t_McStateExtra_aux}; const RefT t_Ref_SignedCertificate{t_SignedCertificate}; const HashmapE t_HashmapE_16_CryptoSignaturePair{16, t_CryptoSignaturePair}; const Maybe t_Maybe_Ref_InMsg{t_Ref_InMsg}; -const RefT t_Ref_TYPE_1673{t_McBlockExtra_aux}; +const RefT t_Ref_TYPE_1674{t_McBlockExtra_aux}; const Hashmap t_Hashmap_16_ValidatorDescr{16, t_ValidatorDescr}; const HashmapE t_HashmapE_16_ValidatorDescr{16, t_ValidatorDescr}; const Hashmap t_Hashmap_32_True{32, t_True}; @@ -17425,6 +21162,156 @@ const RefT t_Ref_BlockSignatures{t_BlockSignatures}; const Maybe t_Maybe_Ref_BlockSignatures{t_Ref_BlockSignatures}; const RefT t_Ref_TopBlockDescr{t_TopBlockDescr}; const HashmapE t_HashmapE_96_Ref_TopBlockDescr{96, t_Ref_TopBlockDescr}; +const Int t_int64{64}; +const Int t_int257{257}; +const NatWidth t_natwidth_10{10}; +const NatLeq t_natleq_4{4}; +const RefT t_Ref_VmStackValue{t_VmStackValue}; +const NatWidth t_natwidth_24{24}; +const HashmapE t_HashmapE_4_VmStackValue{4, t_VmStackValue}; +const RefT t_Ref_TYPE_1705{t_VmGasLimits_aux}; +const HashmapE t_HashmapE_256_Ref_Cell{256, t_RefCell}; +const UInt t_uint13{13}; +const Maybe t_Maybe_uint13{t_uint13}; +const Maybe t_Maybe_VmStack{t_VmStack}; +const Int t_int16{16}; +const Maybe t_Maybe_int16{t_int16}; +const RefT t_Ref_VmCont{t_VmCont}; +const UInt t_uint63{63}; +const RefT t_Ref_DNSRecord{t_DNSRecord}; +const HashmapE t_HashmapE_16_Ref_DNSRecord{16, t_Ref_DNSRecord}; + +// definition of type name registration function +bool register_simple_types(std::function func) { + return func("Unit", &t_Unit) + && func("True", &t_True) + && func("Bool", &t_Bool) + && func("BoolFalse", &t_BoolFalse) + && func("BoolTrue", &t_BoolTrue) + && func("Bit", &t_Bit) + && func("Unary", &t_Unary) + && func("MsgAddressExt", &t_MsgAddressExt) + && func("Anycast", &t_Anycast) + && func("MsgAddressInt", &t_MsgAddressInt) + && func("MsgAddress", &t_MsgAddress) + && func("Grams", &t_Grams) + && func("ExtraCurrencyCollection", &t_ExtraCurrencyCollection) + && func("CurrencyCollection", &t_CurrencyCollection) + && func("CommonMsgInfo", &t_CommonMsgInfo) + && func("CommonMsgInfoRelaxed", &t_CommonMsgInfoRelaxed) + && func("TickTock", &t_TickTock) + && func("SimpleLib", &t_SimpleLib) + && func("StateInit", &t_StateInit) + && func("IntermediateAddress", &t_IntermediateAddress) + && func("MsgEnvelope", &t_MsgEnvelope) + && func("Transaction", &t_Transaction) + && func("InMsg", &t_InMsg) + && func("ImportFees", &t_ImportFees) + && func("InMsgDescr", &t_InMsgDescr) + && func("OutMsg", &t_OutMsg) + && func("EnqueuedMsg", &t_EnqueuedMsg) + && func("OutMsgDescr", &t_OutMsgDescr) + && func("OutMsgQueue", &t_OutMsgQueue) + && func("ProcessedUpto", &t_ProcessedUpto) + && func("ProcessedInfo", &t_ProcessedInfo) + && func("IhrPendingSince", &t_IhrPendingSince) + && func("IhrPendingInfo", &t_IhrPendingInfo) + && func("OutMsgQueueInfo", &t_OutMsgQueueInfo) + && func("StorageUsed", &t_StorageUsed) + && func("StorageUsedShort", &t_StorageUsedShort) + && func("StorageInfo", &t_StorageInfo) + && func("Account", &t_Account) + && func("AccountStorage", &t_AccountStorage) + && func("AccountState", &t_AccountState) + && func("AccountStatus", &t_AccountStatus) + && func("ShardAccount", &t_ShardAccount) + && func("DepthBalanceInfo", &t_DepthBalanceInfo) + && func("ShardAccounts", &t_ShardAccounts) + && func("TransactionDescr", &t_TransactionDescr) + && func("AccountBlock", &t_AccountBlock) + && func("ShardAccountBlocks", &t_ShardAccountBlocks) + && func("AccStatusChange", &t_AccStatusChange) + && func("TrStoragePhase", &t_TrStoragePhase) + && func("TrCreditPhase", &t_TrCreditPhase) + && func("ComputeSkipReason", &t_ComputeSkipReason) + && func("TrComputePhase", &t_TrComputePhase) + && func("TrActionPhase", &t_TrActionPhase) + && func("TrBouncePhase", &t_TrBouncePhase) + && func("SplitMergeInfo", &t_SplitMergeInfo) + && func("SmartContractInfo", &t_SmartContractInfo) + && func("OutAction", &t_OutAction) + && func("LibRef", &t_LibRef) + && func("OutListNode", &t_OutListNode) + && func("ShardIdent", &t_ShardIdent) + && func("ExtBlkRef", &t_ExtBlkRef) + && func("BlockIdExt", &t_BlockIdExt) + && func("BlkMasterInfo", &t_BlkMasterInfo) + && func("LibDescr", &t_LibDescr) + && func("McStateExtra", &t_McStateExtra) + && func("ShardStateUnsplit", &t_ShardStateUnsplit) + && func("ShardState", &t_ShardState) + && func("BlockInfo", &t_BlockInfo) + && func("ValueFlow", &t_ValueFlow) + && func("BlockExtra", &t_BlockExtra) + && func("Block", &t_Block) + && func("McBlockExtra", &t_McBlockExtra) + && func("FutureSplitMerge", &t_FutureSplitMerge) + && func("ShardDescr", &t_ShardDescr) + && func("ShardHashes", &t_ShardHashes) + && func("ShardFeeCreated", &t_ShardFeeCreated) + && func("ShardFees", &t_ShardFees) + && func("ConfigParams", &t_ConfigParams) + && func("ValidatorInfo", &t_ValidatorInfo) + && func("ValidatorBaseInfo", &t_ValidatorBaseInfo) + && func("KeyMaxLt", &t_KeyMaxLt) + && func("KeyExtBlkRef", &t_KeyExtBlkRef) + && func("OldMcBlocksInfo", &t_OldMcBlocksInfo) + && func("Counters", &t_Counters) + && func("CreatorStats", &t_CreatorStats) + && func("BlockCreateStats", &t_BlockCreateStats) + && func("SigPubKey", &t_SigPubKey) + && func("CryptoSignatureSimple", &t_CryptoSignatureSimple) + && func("CryptoSignature", &t_CryptoSignature) + && func("CryptoSignaturePair", &t_CryptoSignaturePair) + && func("Certificate", &t_Certificate) + && func("CertificateEnv", &t_CertificateEnv) + && func("SignedCertificate", &t_SignedCertificate) + && func("ValidatorDescr", &t_ValidatorDescr) + && func("ValidatorSet", &t_ValidatorSet) + && func("GlobalVersion", &t_GlobalVersion) + && func("WorkchainDescr", &t_WorkchainDescr) + && func("BlockCreateFees", &t_BlockCreateFees) + && func("StoragePrices", &t_StoragePrices) + && func("GasLimitsPrices", &t_GasLimitsPrices) + && func("ParamLimits", &t_ParamLimits) + && func("BlockLimits", &t_BlockLimits) + && func("MsgForwardPrices", &t_MsgForwardPrices) + && func("CatchainConfig", &t_CatchainConfig) + && func("ConsensusConfig", &t_ConsensusConfig) + && func("ValidatorTempKey", &t_ValidatorTempKey) + && func("ValidatorSignedTempKey", &t_ValidatorSignedTempKey) + && func("BlockSignaturesPure", &t_BlockSignaturesPure) + && func("BlockSignatures", &t_BlockSignatures) + && func("BlockProof", &t_BlockProof) + && func("TopBlockDescr", &t_TopBlockDescr) + && func("TopBlockDescrSet", &t_TopBlockDescrSet) + && func("VmStackValue", &t_VmStackValue) + && func("VmCellSlice", &t_VmCellSlice) + && func("VmCont", &t_VmCont) + && func("VmStack", &t_VmStack) + && func("VmSaveList", &t_VmSaveList) + && func("VmGasLimits", &t_VmGasLimits) + && func("VmLibraries", &t_VmLibraries) + && func("VmControlData", &t_VmControlData) + && func("DNSRecord", &t_DNSRecord) + && func("DNS_RecordSet", &t_DNS_RecordSet) + && func("Text", &t_Text) + && func("ProtoList", &t_ProtoList) + && func("Protocol", &t_Protocol) + && func("SmcCapList", &t_SmcCapList) + && func("SmcCapability", &t_SmcCapability); +} + } // namespace gen diff --git a/submodules/ton/tonlib-src/crypto/block/block-auto.h b/submodules/ton/tonlib-src/crypto/block/block-auto.h index 507b5161e8..ac0bf542b8 100644 --- a/submodules/ton/tonlib-src/crypto/block/block-auto.h +++ b/submodules/ton/tonlib-src/crypto/block/block-auto.h @@ -15,11 +15,16 @@ // uses built-in type `uint` // uses built-in type `bits` // uses built-in type `int8` +// uses built-in type `uint13` // uses built-in type `uint15` +// uses built-in type `int16` // uses built-in type `uint16` // uses built-in type `int32` // uses built-in type `uint32` +// uses built-in type `uint63` +// uses built-in type `int64` // uses built-in type `uint64` +// uses built-in type `int257` // uses built-in type `bits256` namespace block { @@ -47,7 +52,7 @@ struct Unit final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return true; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return true; } bool fetch_enum_to(vm::CellSlice& cs, char& value) const; @@ -88,7 +93,7 @@ struct True final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return true; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return true; } bool fetch_enum_to(vm::CellSlice& cs, char& value) const; @@ -132,7 +137,7 @@ struct Bool final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(1); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(1); } bool fetch_enum_to(vm::CellSlice& cs, char& value) const; @@ -181,7 +186,7 @@ struct BoolFalse final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(1); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool fetch_enum_to(vm::CellSlice& cs, char& value) const; bool store_enum_from(vm::CellBuilder& cb, int value) const; bool unpack(vm::CellSlice& cs, Record& data) const; @@ -221,7 +226,7 @@ struct BoolTrue final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(1); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool fetch_enum_to(vm::CellSlice& cs, char& value) const; bool store_enum_from(vm::CellBuilder& cb, int value) const; bool unpack(vm::CellSlice& cs, Record& data) const; @@ -263,7 +268,7 @@ struct Maybe final : TLB_Complex { Record_just(Ref _value) : value(std::move(_value)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_nothing& data) const; bool unpack_nothing(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_nothing& data) const; @@ -312,7 +317,7 @@ struct Either final : TLB_Complex { Record_right(Ref _value) : value(std::move(_value)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_left& data) const; bool unpack_left(vm::CellSlice& cs, Ref& value) const; bool cell_unpack(Ref cell_ref, Record_left& data) const; @@ -356,7 +361,7 @@ struct Both final : TLB_Complex { Record(Ref _first, Ref _second) : first(std::move(_first)), second(std::move(_second)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_pair(vm::CellSlice& cs, Ref& first, Ref& second) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -394,7 +399,7 @@ struct Bit final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(1); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(1); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -429,7 +434,7 @@ struct Hashmap final : TLB_Complex { Hashmap(int m, const TLB& X) : m_(m), X_(X) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -473,7 +478,7 @@ struct HashmapNode final : TLB_Complex { }; struct Record_hmn_fork; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_hmn_leaf& data) const; bool unpack_hmn_leaf(vm::CellSlice& cs, Ref& value) const; bool cell_unpack(Ref cell_ref, Record_hmn_leaf& data) const; @@ -522,8 +527,8 @@ struct HmLabel final : TLB_Complex { struct Record_hml_same; bool skip(vm::CellSlice& cs) const override; bool skip(vm::CellSlice& cs, int& m_) const; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; - bool validate_skip(vm::CellSlice& cs, bool weak, int& m_) const; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int *ops, vm::CellSlice& cs, bool weak, int& m_) const; bool fetch_to(vm::CellSlice& cs, Ref& res, int& m_) const; bool unpack(vm::CellSlice& cs, Record_hml_short& data, int& m_) const; bool cell_unpack(Ref cell_ref, Record_hml_short& data, int& m_) const; @@ -603,8 +608,8 @@ struct Unary final : TLB_Complex { }; bool skip(vm::CellSlice& cs) const override; bool skip(vm::CellSlice& cs, int& m_) const; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; - bool validate_skip(vm::CellSlice& cs, bool weak, int& m_) const; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int *ops, vm::CellSlice& cs, bool weak, int& m_) const; bool fetch_to(vm::CellSlice& cs, Ref& res, int& m_) const; bool unpack(vm::CellSlice& cs, Record_unary_zero& data, int& m_) const; bool unpack_unary_zero(vm::CellSlice& cs, int& m_) const; @@ -656,7 +661,7 @@ struct HashmapE final : TLB_Complex { Record_hme_root(Ref _root) : n(-1), root(std::move(_root)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_hme_empty& data) const; bool unpack_hme_empty(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_hme_empty& data) const; @@ -700,7 +705,7 @@ struct BitstringSet final : TLB_Complex { Record(Ref _x) : n(-1), x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, int& n, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -731,7 +736,7 @@ struct HashmapAug final : TLB_Complex { HashmapAug(int m, const TLB& X, const TLB& Y) : m_(m), X_(X), Y_(Y) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -776,7 +781,7 @@ struct HashmapAugNode final : TLB_Complex { }; struct Record_ahmn_fork; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_ahmn_leaf& data) const; bool unpack_ahmn_leaf(vm::CellSlice& cs, Ref& extra, Ref& value) const; bool cell_unpack(Ref cell_ref, Record_ahmn_leaf& data) const; @@ -825,7 +830,7 @@ struct HashmapAugE final : TLB_Complex { }; struct Record_ahme_root; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_ahme_empty& data) const; bool unpack_ahme_empty(vm::CellSlice& cs, Ref& extra) const; bool cell_unpack(Ref cell_ref, Record_ahme_empty& data) const; @@ -873,7 +878,7 @@ struct VarHashmap final : TLB_Complex { VarHashmap(int m, const TLB& X) : m_(m), X_(X) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -919,7 +924,7 @@ struct VarHashmapNode final : TLB_Complex { struct Record_vhmn_fork; struct Record_vhmn_cont; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_vhmn_leaf& data) const; bool unpack_vhmn_leaf(vm::CellSlice& cs, Ref& value) const; bool cell_unpack(Ref cell_ref, Record_vhmn_leaf& data) const; @@ -987,7 +992,7 @@ struct VarHashmapE final : TLB_Complex { Record_vhme_root(Ref _root) : n(-1), root(std::move(_root)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_vhme_empty& data) const; bool unpack_vhme_empty(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_vhme_empty& data) const; @@ -1026,7 +1031,7 @@ struct PfxHashmap final : TLB_Complex { PfxHashmap(int m, const TLB& X) : m_(m), X_(X) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -1070,7 +1075,7 @@ struct PfxHashmapNode final : TLB_Complex { }; struct Record_phmn_fork; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_phmn_leaf& data) const; bool unpack_phmn_leaf(vm::CellSlice& cs, Ref& value) const; bool cell_unpack(Ref cell_ref, Record_phmn_leaf& data) const; @@ -1127,7 +1132,7 @@ struct PfxHashmapE final : TLB_Complex { Record_phme_root(Ref _root) : n(-1), root(std::move(_root)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_phme_empty& data) const; bool unpack_phme_empty(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_phme_empty& data) const; @@ -1172,7 +1177,7 @@ struct MsgAddressExt final : TLB_Complex { Record_addr_extern(int _len, Ref _external_address) : len(_len), external_address(std::move(_external_address)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_addr_none& data) const; bool unpack_addr_none(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_addr_none& data) const; @@ -1216,7 +1221,7 @@ struct Anycast final : TLB_Complex { Record(int _depth, Ref _rewrite_pfx) : depth(_depth), rewrite_pfx(std::move(_rewrite_pfx)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_anycast_info(vm::CellSlice& cs, int& depth, Ref& rewrite_pfx) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1248,7 +1253,7 @@ struct MsgAddressInt final : TLB_Complex { struct Record_addr_std; struct Record_addr_var; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_addr_std& data) const; bool unpack_addr_std(vm::CellSlice& cs, Ref& anycast, int& workchain_id, td::BitArray<256>& address) const; bool cell_unpack(Ref cell_ref, Record_addr_std& data) const; @@ -1312,7 +1317,7 @@ struct MsgAddress final : TLB_Complex { Record_cons2(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_cons1& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record_cons1& data) const; @@ -1352,7 +1357,7 @@ struct VarUInteger final : TLB_Complex { VarUInteger(int m) : m_(m) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_var_uint(vm::CellSlice& cs, int& n, int& len, RefInt256& value) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1391,7 +1396,7 @@ struct VarInteger final : TLB_Complex { VarInteger(int m) : m_(m) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_var_int(vm::CellSlice& cs, int& n, int& len, RefInt256& value) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1433,7 +1438,7 @@ struct Grams final : TLB_Complex { Record(Ref _amount) : amount(std::move(_amount)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_nanograms(vm::CellSlice& cs, Ref& amount) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1468,7 +1473,7 @@ struct ExtraCurrencyCollection final : TLB_Complex { Record(Ref _dict) : dict(std::move(_dict)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_extra_currencies(vm::CellSlice& cs, Ref& dict) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1504,7 +1509,7 @@ struct CurrencyCollection final : TLB_Complex { Record(Ref _grams, Ref _other) : grams(std::move(_grams)), other(std::move(_other)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_currencies(vm::CellSlice& cs, Ref& grams, Ref& other) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1537,7 +1542,7 @@ struct CommonMsgInfo final : TLB_Complex { struct Record_ext_in_msg_info; struct Record_ext_out_msg_info; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_int_msg_info& data) const; bool cell_unpack(Ref cell_ref, Record_int_msg_info& data) const; bool pack(vm::CellBuilder& cb, const Record_int_msg_info& data) const; @@ -1612,7 +1617,7 @@ struct CommonMsgInfoRelaxed final : TLB_Complex { struct Record_int_msg_info; struct Record_ext_out_msg_info; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_int_msg_info& data) const; bool cell_unpack(Ref cell_ref, Record_int_msg_info& data) const; bool pack(vm::CellBuilder& cb, const Record_int_msg_info& data) const; @@ -1679,7 +1684,7 @@ struct TickTock final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(2); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(2); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -1711,7 +1716,7 @@ struct StateInit final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -1759,7 +1764,7 @@ struct SimpleLib final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x10001); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_simple_lib(vm::CellSlice& cs, bool& public1, Ref& root) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1791,7 +1796,7 @@ struct Message final : TLB_Complex { Message(const TLB& X) : X_(X) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_message(vm::CellSlice& cs, Ref& info, Ref& init, Ref& body) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1830,7 +1835,7 @@ struct MessageRelaxed final : TLB_Complex { MessageRelaxed(const TLB& X) : X_(X) {} struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_message(vm::CellSlice& cs, Ref& info, Ref& init, Ref& body) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -1887,7 +1892,7 @@ struct IntermediateAddress final : TLB_Complex { Record_interm_addr_ext(int _workchain_id, unsigned long long _addr_pfx) : workchain_id(_workchain_id), addr_pfx(_addr_pfx) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_interm_addr_regular& data) const; bool unpack_interm_addr_regular(vm::CellSlice& cs, int& use_dest_bits) const; bool cell_unpack(Ref cell_ref, Record_interm_addr_regular& data) const; @@ -1934,7 +1939,7 @@ struct MsgEnvelope final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 4 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -1983,7 +1988,7 @@ struct InMsg final : TLB_Complex { struct Record_msg_discard_fin; struct Record_msg_discard_tr; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_msg_import_ext& data) const; bool unpack_msg_import_ext(vm::CellSlice& cs, Ref& msg, Ref& transaction) const; bool cell_unpack(Ref cell_ref, Record_msg_import_ext& data) const; @@ -2115,7 +2120,7 @@ struct ImportFees final : TLB_Complex { Record(Ref _fees_collected, Ref _value_imported) : fees_collected(std::move(_fees_collected)), value_imported(std::move(_value_imported)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_import_fees(vm::CellSlice& cs, Ref& fees_collected, Ref& value_imported) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2150,7 +2155,7 @@ struct InMsgDescr final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2223,7 +2228,7 @@ struct OutMsg final : TLB_Complex { Record_msg_export_deq_imm(Ref _out_msg, Ref _reimport) : out_msg(std::move(_out_msg)), reimport(std::move(_reimport)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_msg_export_ext& data) const; bool unpack_msg_export_ext(vm::CellSlice& cs, Ref& msg, Ref& transaction) const; bool cell_unpack(Ref cell_ref, Record_msg_export_ext& data) const; @@ -2321,7 +2326,7 @@ struct EnqueuedMsg final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x10040); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, unsigned long long& enqueued_lt, Ref& out_msg) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2356,7 +2361,7 @@ struct OutMsgDescr final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2391,7 +2396,7 @@ struct OutMsgQueue final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2432,7 +2437,7 @@ struct ProcessedUpto final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(320); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(320); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -2469,7 +2474,7 @@ struct ProcessedInfo final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2509,7 +2514,7 @@ struct IhrPendingSince final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(64); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(64); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -2546,7 +2551,7 @@ struct IhrPendingInfo final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2576,7 +2581,7 @@ struct OutMsgQueueInfo final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& out_queue, Ref& proc_info, Ref& ihr_pending) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2615,7 +2620,7 @@ struct StorageUsed final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_storage_used(vm::CellSlice& cs, Ref& cells, Ref& bits, Ref& public_cells) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2660,7 +2665,7 @@ struct StorageUsedShort final : TLB_Complex { Record(Ref _cells, Ref _bits) : cells(std::move(_cells)), bits(std::move(_bits)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_storage_used_short(vm::CellSlice& cs, Ref& cells, Ref& bits) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2690,7 +2695,7 @@ struct StorageInfo final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_storage_info(vm::CellSlice& cs, Ref& used, unsigned& last_paid, Ref& due_payment) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2732,7 +2737,7 @@ struct Account final : TLB_Complex { }; struct Record_account; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_account_none& data) const; bool unpack_account_none(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_account_none& data) const; @@ -2779,7 +2784,7 @@ struct AccountStorage final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_account_storage(vm::CellSlice& cs, unsigned long long& last_trans_lt, Ref& balance, Ref& state) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -2833,7 +2838,7 @@ struct AccountState final : TLB_Complex { Record_account_frozen(const td::BitArray<256>& _state_hash) : state_hash(_state_hash) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_account_uninit& data) const; bool unpack_account_uninit(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_account_uninit& data) const; @@ -2895,7 +2900,7 @@ struct AccountStatus final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(2); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(2); } bool fetch_enum_to(vm::CellSlice& cs, char& value) const; @@ -2958,7 +2963,7 @@ struct ShardAccount final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x10140); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_account_descr(vm::CellSlice& cs, Ref& account, td::BitArray<256>& last_trans_hash, unsigned long long& last_trans_lt) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3003,7 +3008,7 @@ struct DepthBalanceInfo final : TLB_Complex { Record(int _split_depth, Ref _balance) : split_depth(_split_depth), balance(std::move(_balance)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_depth_balance(vm::CellSlice& cs, int& split_depth, Ref& balance) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3038,7 +3043,7 @@ struct ShardAccounts final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3074,7 +3079,7 @@ struct Transaction_aux final : TLB_Complex { Record(Ref _in_msg, Ref _out_msgs) : in_msg(std::move(_in_msg)), out_msgs(std::move(_out_msgs)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& in_msg, Ref& out_msgs) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3105,7 +3110,7 @@ struct Transaction final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 7 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -3160,7 +3165,7 @@ struct MERKLE_UPDATE final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x20208); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -3208,7 +3213,7 @@ struct HASH_UPDATE final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(520); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_update_hashes(vm::CellSlice& cs, td::BitArray<256>& old_hash, td::BitArray<256>& new_hash) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3237,7 +3242,7 @@ struct AccountBlock final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 5 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_acc_trans(vm::CellSlice& cs, td::BitArray<256>& account_addr, Ref& transactions, Ref& state_update) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3281,7 +3286,7 @@ struct ShardAccountBlocks final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3311,7 +3316,7 @@ struct TrStoragePhase final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_tr_phase_storage(vm::CellSlice& cs, Ref& storage_fees_collected, Ref& storage_fees_due, char& status_change) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3359,7 +3364,7 @@ struct AccStatusChange final : TLB_Complex { typedef AccStatusChange type_class; }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool fetch_enum_to(vm::CellSlice& cs, char& value) const; bool store_enum_from(vm::CellBuilder& cb, int value) const; bool unpack(vm::CellSlice& cs, Record_acst_unchanged& data) const; @@ -3413,7 +3418,7 @@ struct TrCreditPhase final : TLB_Complex { Record(Ref _due_fees_collected, Ref _credit) : due_fees_collected(std::move(_due_fees_collected)), credit(std::move(_credit)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_tr_phase_credit(vm::CellSlice& cs, Ref& due_fees_collected, Ref& credit) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -3443,7 +3448,7 @@ struct TrComputePhase_aux final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -3490,7 +3495,7 @@ struct TrComputePhase final : TLB_Complex { }; struct Record_tr_phase_compute_vm; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_tr_phase_compute_skipped& data) const; bool unpack_tr_phase_compute_skipped(vm::CellSlice& cs, char& reason) const; bool cell_unpack(Ref cell_ref, Record_tr_phase_compute_skipped& data) const; @@ -3548,7 +3553,7 @@ struct ComputeSkipReason final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(2); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool fetch_enum_to(vm::CellSlice& cs, char& value) const; bool store_enum_from(vm::CellBuilder& cb, int value) const; bool unpack(vm::CellSlice& cs, Record_cskip_no_state& data) const; @@ -3596,7 +3601,7 @@ struct TrActionPhase final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -3653,7 +3658,7 @@ struct TrBouncePhase final : TLB_Complex { }; struct Record_tr_phase_bounce_ok; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_tr_phase_bounce_negfunds& data) const; bool unpack_tr_phase_bounce_negfunds(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_tr_phase_bounce_negfunds& data) const; @@ -3713,7 +3718,7 @@ struct SplitMergeInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(524); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(524); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -3763,7 +3768,7 @@ struct TransactionDescr final : TLB_Complex { struct Record_trans_merge_prepare; struct Record_trans_merge_install; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_trans_ord& data) const; bool cell_unpack(Ref cell_ref, Record_trans_ord& data) const; bool pack(vm::CellBuilder& cb, const Record_trans_ord& data) const; @@ -3896,7 +3901,7 @@ struct SmartContractInfo final : TLB_Complex { static constexpr unsigned cons_tag[1] = { 0x76ef1ea }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -3941,7 +3946,7 @@ struct OutList final : TLB_Complex { }; struct Record_out_list; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_out_list_empty& data) const; bool unpack_out_list_empty(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_out_list_empty& data) const; @@ -3975,14 +3980,63 @@ struct OutList::Record_out_list { Record_out_list(Ref _prev, Ref _action) : n(-1), prev(std::move(_prev)), action(std::move(_action)) {} }; +// +// headers for type `LibRef` +// + +struct LibRef final : TLB_Complex { + enum { libref_hash, libref_ref }; + static constexpr int cons_len_exact = 1; + struct Record_libref_hash { + typedef LibRef type_class; + td::BitArray<256> lib_hash; // lib_hash : bits256 + Record_libref_hash() = default; + Record_libref_hash(const td::BitArray<256>& _lib_hash) : lib_hash(_lib_hash) {} + }; + struct Record_libref_ref { + typedef LibRef type_class; + Ref library; // library : ^Cell + Record_libref_ref() = default; + Record_libref_ref(Ref _library) : library(std::move(_library)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_libref_hash& data) const; + bool unpack_libref_hash(vm::CellSlice& cs, td::BitArray<256>& lib_hash) const; + bool cell_unpack(Ref cell_ref, Record_libref_hash& data) const; + bool cell_unpack_libref_hash(Ref cell_ref, td::BitArray<256>& lib_hash) const; + bool pack(vm::CellBuilder& cb, const Record_libref_hash& data) const; + bool pack_libref_hash(vm::CellBuilder& cb, td::BitArray<256> lib_hash) const; + bool cell_pack(Ref& cell_ref, const Record_libref_hash& data) const; + bool cell_pack_libref_hash(Ref& cell_ref, td::BitArray<256> lib_hash) const; + bool unpack(vm::CellSlice& cs, Record_libref_ref& data) const; + bool unpack_libref_ref(vm::CellSlice& cs, Ref& library) const; + bool cell_unpack(Ref cell_ref, Record_libref_ref& data) const; + bool cell_unpack_libref_ref(Ref cell_ref, Ref& library) const; + bool pack(vm::CellBuilder& cb, const Record_libref_ref& data) const; + bool pack_libref_ref(vm::CellBuilder& cb, Ref library) const; + bool cell_pack(Ref& cell_ref, const Record_libref_ref& data) const; + bool cell_pack_libref_ref(Ref& cell_ref, Ref library) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "LibRef"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return (int)cs.prefetch_ulong(1); + } +}; + +extern const LibRef t_LibRef; + // // headers for type `OutAction` // struct OutAction final : TLB_Complex { - enum { action_send_msg, action_reserve_currency, action_set_code }; + enum { action_send_msg, action_change_library, action_reserve_currency, action_set_code }; static constexpr int cons_len_exact = 32; - static constexpr unsigned cons_tag[3] = { 0xec3c86d, 0x36e6b809, 0xad4de08eU }; + static constexpr unsigned cons_tag[4] = { 0xec3c86d, 0x26fa1dd4, 0x36e6b809, 0xad4de08eU }; struct Record_action_send_msg { typedef OutAction type_class; int mode; // mode : ## 8 @@ -4003,8 +4057,15 @@ struct OutAction final : TLB_Complex { Record_action_reserve_currency() = default; Record_action_reserve_currency(int _mode, Ref _currency) : mode(_mode), currency(std::move(_currency)) {} }; + struct Record_action_change_library { + typedef OutAction type_class; + int mode; // mode : ## 7 + Ref libref; // libref : LibRef + Record_action_change_library() = default; + Record_action_change_library(int _mode, Ref _libref) : mode(_mode), libref(std::move(_libref)) {} + }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_action_send_msg& data) const; bool unpack_action_send_msg(vm::CellSlice& cs, int& mode, Ref& out_msg) const; bool cell_unpack(Ref cell_ref, Record_action_send_msg& data) const; @@ -4029,13 +4090,21 @@ struct OutAction final : TLB_Complex { bool pack_action_reserve_currency(vm::CellBuilder& cb, int mode, Ref currency) const; bool cell_pack(Ref& cell_ref, const Record_action_reserve_currency& data) const; bool cell_pack_action_reserve_currency(Ref& cell_ref, int mode, Ref currency) const; + bool unpack(vm::CellSlice& cs, Record_action_change_library& data) const; + bool unpack_action_change_library(vm::CellSlice& cs, int& mode, Ref& libref) const; + bool cell_unpack(Ref cell_ref, Record_action_change_library& data) const; + bool cell_unpack_action_change_library(Ref cell_ref, int& mode, Ref& libref) const; + bool pack(vm::CellBuilder& cb, const Record_action_change_library& data) const; + bool pack_action_change_library(vm::CellBuilder& cb, int mode, Ref libref) const; + bool cell_pack(Ref& cell_ref, const Record_action_change_library& data) const; + bool cell_pack_action_change_library(Ref& cell_ref, int mode, Ref libref) const; bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; std::ostream& print_type(std::ostream& os) const override { return os << "OutAction"; } int check_tag(const vm::CellSlice& cs) const override; int get_tag(const vm::CellSlice& cs) const override { - return cs.bselect(3, 0x23); + return cs.bselect(4, 0x40d); } }; @@ -4056,7 +4125,7 @@ struct OutListNode final : TLB_Complex { Record(Ref _prev, Ref _action) : prev(std::move(_prev)), action(std::move(_action)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_out_list_node(vm::CellSlice& cs, Ref& prev, Ref& action) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -4091,7 +4160,7 @@ struct ShardIdent final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(104); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_shard_ident(vm::CellSlice& cs, int& shard_pfx_bits, int& workchain_id, unsigned long long& shard_prefix) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -4135,7 +4204,7 @@ struct ExtBlkRef final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(608); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(608); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -4178,7 +4247,7 @@ struct BlockIdExt final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(648); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4224,7 +4293,7 @@ struct BlkMasterInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(608); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(608); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -4256,7 +4325,7 @@ struct ShardStateUnsplit_aux final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4295,7 +4364,7 @@ struct ShardStateUnsplit final : TLB_Complex { static constexpr unsigned cons_tag[1] = { 0x9023afe2U }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4352,7 +4421,7 @@ struct ShardState final : TLB_Complex { Record_split_state(Ref _left, Ref _right) : left(std::move(_left)), right(std::move(_right)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_cons1& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record_cons1& data) const; @@ -4396,7 +4465,7 @@ struct LibDescr final : TLB_Complex { Record(Ref _lib, Ref _publishers) : lib(std::move(_lib)), publishers(std::move(_publishers)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_shared_lib_descr(vm::CellSlice& cs, Ref& lib, Ref& publishers) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -4427,7 +4496,7 @@ struct BlockInfo final : TLB_Complex { static constexpr unsigned cons_tag[1] = { 0x9bc7a987U }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4496,7 +4565,7 @@ struct BlkPrevInfo final : TLB_Complex { Record_prev_blks_info(Ref _prev1, Ref _prev2) : prev1(std::move(_prev1)), prev2(std::move(_prev2)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_prev_blk_info& data) const; bool unpack_prev_blk_info(vm::CellSlice& cs, Ref& prev) const; bool cell_unpack(Ref cell_ref, Record_prev_blk_info& data) const; @@ -4536,7 +4605,7 @@ struct Block final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x40040); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4574,7 +4643,7 @@ struct BlockExtra final : TLB_Complex { static constexpr unsigned cons_tag[1] = { 0x4a33f6fd }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4612,7 +4681,7 @@ struct ValueFlow_aux final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4648,7 +4717,7 @@ struct ValueFlow_aux1 final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4685,7 +4754,7 @@ struct ValueFlow final : TLB_Complex { static constexpr unsigned cons_tag[1] = { 0xb8e48dfbU }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4734,7 +4803,7 @@ struct BinTree final : TLB_Complex { Record_bt_fork(Ref _left, Ref _right) : left(std::move(_left)), right(std::move(_right)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_bt_leaf& data) const; bool unpack_bt_leaf(vm::CellSlice& cs, Ref& leaf) const; bool cell_unpack(Ref cell_ref, Record_bt_leaf& data) const; @@ -4787,7 +4856,7 @@ struct FutureSplitMerge final : TLB_Complex { Record_fsm_merge(unsigned _merge_utime, unsigned _interval) : merge_utime(_merge_utime), interval(_interval) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_fsm_none& data) const; bool unpack_fsm_none(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_fsm_none& data) const; @@ -4834,7 +4903,7 @@ struct ShardDescr final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 11 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -4890,7 +4959,7 @@ struct ShardHashes final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -4929,7 +4998,7 @@ struct BinTreeAug final : TLB_Complex { }; struct Record_bta_fork; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_bta_leaf& data) const; bool unpack_bta_leaf(vm::CellSlice& cs, Ref& extra, Ref& leaf) const; bool cell_unpack(Ref cell_ref, Record_bta_leaf& data) const; @@ -4980,7 +5049,7 @@ struct ShardFeeCreated final : TLB_Complex { Record(Ref _fees, Ref _create) : fees(std::move(_fees)), create(std::move(_create)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& fees, Ref& create) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5015,7 +5084,7 @@ struct ShardFees final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5056,7 +5125,7 @@ struct ConfigParams final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x10100); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, td::BitArray<256>& config_addr, Ref& config) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5091,7 +5160,7 @@ struct ValidatorInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(65); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(65); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -5143,7 +5212,7 @@ struct ValidatorBaseInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(64); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(64); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -5186,7 +5255,7 @@ struct KeyMaxLt final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(65); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(65); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -5229,7 +5298,7 @@ struct KeyExtBlkRef final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(609); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(609); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -5266,7 +5335,7 @@ struct OldMcBlocksInfo final : TLB_Complex { Record(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5301,7 +5370,7 @@ struct Counters final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(224); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.advance(224); } bool unpack(vm::CellSlice& cs, Record& data) const; @@ -5351,7 +5420,7 @@ struct CreatorStats final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(452); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_creator_info(vm::CellSlice& cs, Ref& mc_blocks, Ref& shard_blocks) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5377,32 +5446,46 @@ extern const CreatorStats t_CreatorStats; // struct BlockCreateStats final : TLB_Complex { - enum { block_create_stats }; + enum { block_create_stats, block_create_stats_ext }; static constexpr int cons_len_exact = 8; - static constexpr unsigned char cons_tag[1] = { 23 }; - struct Record { + static constexpr unsigned char cons_tag[2] = { 23, 0x34 }; + struct Record_block_create_stats { typedef BlockCreateStats type_class; Ref counters; // counters : HashmapE 256 CreatorStats - Record() = default; - Record(Ref _counters) : counters(std::move(_counters)) {} + Record_block_create_stats() = default; + Record_block_create_stats(Ref _counters) : counters(std::move(_counters)) {} + }; + struct Record_block_create_stats_ext { + typedef BlockCreateStats type_class; + Ref counters; // counters : HashmapAugE 256 CreatorStats uint32 + Record_block_create_stats_ext() = default; + Record_block_create_stats_ext(Ref _counters) : counters(std::move(_counters)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; - bool unpack(vm::CellSlice& cs, Record& data) const; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_block_create_stats& data) const; bool unpack_block_create_stats(vm::CellSlice& cs, Ref& counters) const; - bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack(Ref cell_ref, Record_block_create_stats& data) const; bool cell_unpack_block_create_stats(Ref cell_ref, Ref& counters) const; - bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack(vm::CellBuilder& cb, const Record_block_create_stats& data) const; bool pack_block_create_stats(vm::CellBuilder& cb, Ref counters) const; - bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack(Ref& cell_ref, const Record_block_create_stats& data) const; bool cell_pack_block_create_stats(Ref& cell_ref, Ref counters) const; + bool unpack(vm::CellSlice& cs, Record_block_create_stats_ext& data) const; + bool unpack_block_create_stats_ext(vm::CellSlice& cs, Ref& counters) const; + bool cell_unpack(Ref cell_ref, Record_block_create_stats_ext& data) const; + bool cell_unpack_block_create_stats_ext(Ref cell_ref, Ref& counters) const; + bool pack(vm::CellBuilder& cb, const Record_block_create_stats_ext& data) const; + bool pack_block_create_stats_ext(vm::CellBuilder& cb, Ref counters) const; + bool cell_pack(Ref& cell_ref, const Record_block_create_stats_ext& data) const; + bool cell_pack_block_create_stats_ext(Ref& cell_ref, Ref counters) const; bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; std::ostream& print_type(std::ostream& os) const override { return os << "BlockCreateStats"; } int check_tag(const vm::CellSlice& cs) const override; int get_tag(const vm::CellSlice& cs) const override { - return 0; + return cs.bselect(3, 3); } }; @@ -5417,7 +5500,7 @@ struct McStateExtra_aux final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -5456,7 +5539,7 @@ struct McStateExtra final : TLB_Complex { static constexpr unsigned short cons_tag[1] = { 0xcc26 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -5503,7 +5586,7 @@ struct SigPubKey final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(288); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_ed25519_pubkey(vm::CellSlice& cs, td::BitArray<256>& pubkey) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5545,7 +5628,7 @@ struct CryptoSignatureSimple final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(516); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_ed25519_signature(vm::CellSlice& cs, td::BitArray<256>& R, td::BitArray<256>& s) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5581,7 +5664,7 @@ struct CryptoSignaturePair final : TLB_Complex { Record(const td::BitArray<256>& _node_id_short, Ref _sign) : node_id_short(_node_id_short), sign(std::move(_sign)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_sig_pair(vm::CellSlice& cs, td::BitArray<256>& node_id_short, Ref& sign) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5617,7 +5700,7 @@ struct Certificate final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(356); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_certificate(vm::CellSlice& cs, Ref& temp_key, unsigned& valid_since, unsigned& valid_until) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5667,7 +5750,7 @@ struct CertificateEnv final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(384); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_certificate_env(vm::CellSlice& cs, Ref& certificate) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5703,7 +5786,7 @@ struct SignedCertificate final : TLB_Complex { Record(Ref _certificate, Ref _certificate_signature) : certificate(std::move(_certificate)), certificate_signature(std::move(_certificate_signature)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_signed_certificate(vm::CellSlice& cs, Ref& certificate, Ref& certificate_signature) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5746,7 +5829,7 @@ struct CryptoSignature final : TLB_Complex { Record_chained_signature(Ref _signed_cert, Ref _temp_key_signature) : signed_cert(std::move(_signed_cert)), temp_key_signature(std::move(_temp_key_signature)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_cons1& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; bool cell_unpack(Ref cell_ref, Record_cons1& data) const; @@ -5784,7 +5867,7 @@ struct McBlockExtra_aux final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_cons1(vm::CellSlice& cs, Ref& prev_blk_signatures, Ref& recover_create_msg, Ref& mint_msg) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -5824,7 +5907,7 @@ struct McBlockExtra final : TLB_Complex { static constexpr unsigned short cons_tag[1] = { 0xcca5 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -5869,7 +5952,7 @@ struct ValidatorDescr final : TLB_Complex { }; struct Record_validator_addr; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_validator& data) const; bool unpack_validator(vm::CellSlice& cs, Ref& public_key, unsigned long long& weight) const; bool cell_unpack(Ref cell_ref, Record_validator& data) const; @@ -5918,7 +6001,7 @@ struct ValidatorSet final : TLB_Complex { struct Record_validators; struct Record_validators_ext; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_validators& data) const; bool cell_unpack(Ref cell_ref, Record_validators& data) const; bool pack(vm::CellBuilder& cb, const Record_validators& data) const; @@ -5981,7 +6064,7 @@ struct GlobalVersion final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(104); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_capabilities(vm::CellSlice& cs, unsigned& version, unsigned long long& capabilities) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -6020,7 +6103,7 @@ struct WorkchainFormat final : TLB_Complex { }; struct Record_wfmt_ext; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_wfmt_basic& data) const; bool unpack_wfmt_basic(vm::CellSlice& cs, int& vm_version, unsigned long long& vm_mode) const; bool cell_unpack(Ref cell_ref, Record_wfmt_basic& data) const; @@ -6063,7 +6146,7 @@ struct WorkchainDescr final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 0xa6 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -6114,7 +6197,7 @@ struct BlockCreateFees final : TLB_Complex { Record(Ref _masterchain_block_fee, Ref _basechain_block_fee) : masterchain_block_fee(std::move(_masterchain_block_fee)), basechain_block_fee(std::move(_basechain_block_fee)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_block_grams_created(vm::CellSlice& cs, Ref& masterchain_block_fee, Ref& basechain_block_fee) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -6150,7 +6233,7 @@ struct StoragePrices final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(296); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -6190,7 +6273,7 @@ struct GasLimitsPrices final : TLB_Complex { struct Record_gas_prices_ext; struct Record_gas_flat_pfx; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_gas_prices& data) const; bool cell_unpack(Ref cell_ref, Record_gas_prices& data) const; bool pack(vm::CellBuilder& cb, const Record_gas_prices& data) const; @@ -6266,7 +6349,7 @@ struct ParamLimits final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(104); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_param_limits(vm::CellSlice& cs, int& underload, int& soft_limit, int& hard_limit) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -6311,7 +6394,7 @@ struct BlockLimits final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(320); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_block_limits(vm::CellSlice& cs, Ref& bytes, Ref& gas, Ref& lt_delta) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -6356,7 +6439,7 @@ struct MsgForwardPrices final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(264); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -6400,7 +6483,7 @@ struct CatchainConfig final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(136); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -6442,7 +6525,7 @@ struct ConsensusConfig final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(264); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -6488,7 +6571,7 @@ struct ValidatorTempKey final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(612); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -6531,7 +6614,7 @@ struct ValidatorSignedTempKey final : TLB_Complex { Record(Ref _key, Ref _signature) : key(std::move(_key)), signature(std::move(_signature)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_signed_temp_key(vm::CellSlice& cs, Ref& key, Ref& signature) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -6734,7 +6817,7 @@ struct ConfigParam final : TLB_Complex { Record_cons39(Ref _x) : x(std::move(_x)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_cons0& data) const; bool unpack_cons0(vm::CellSlice& cs, td::BitArray<256>& config_addr) const; bool cell_unpack(Ref cell_ref, Record_cons0& data) const; @@ -7021,7 +7104,7 @@ struct BlockSignaturesPure final : TLB_Complex { static constexpr int cons_len_exact = 0; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_block_signatures_pure(vm::CellSlice& cs, unsigned& sig_count, unsigned long long& sig_weight, Ref& signatures) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -7067,7 +7150,7 @@ struct BlockSignatures final : TLB_Complex { Record(Ref _validator_info, Ref _pure_signatures) : validator_info(std::move(_validator_info)), pure_signatures(std::move(_pure_signatures)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_block_signatures(vm::CellSlice& cs, Ref& validator_info, Ref& pure_signatures) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -7098,7 +7181,7 @@ struct BlockProof final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 0xc3 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_block_proof(vm::CellSlice& cs, Ref& proof_for, Ref& root, Ref& signatures) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -7142,7 +7225,7 @@ struct ProofChain final : TLB_Complex { }; struct Record_chain_link; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record_chain_empty& data) const; bool unpack_chain_empty(vm::CellSlice& cs) const; bool cell_unpack(Ref cell_ref, Record_chain_empty& data) const; @@ -7186,7 +7269,7 @@ struct TopBlockDescr final : TLB_Complex { static constexpr unsigned char cons_tag[1] = { 0xd5 }; struct Record; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool cell_unpack(Ref cell_ref, Record& data) const; bool pack(vm::CellBuilder& cb, const Record& data) const; @@ -7228,7 +7311,7 @@ struct TopBlockDescrSet final : TLB_Complex { Record(Ref _collection) : collection(std::move(_collection)) {} }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, Record& data) const; bool unpack_top_block_descr_set(vm::CellSlice& cs, Ref& collection) const; bool cell_unpack(Ref cell_ref, Record& data) const; @@ -7249,6 +7332,1194 @@ struct TopBlockDescrSet final : TLB_Complex { extern const TopBlockDescrSet t_TopBlockDescrSet; +// +// headers for type `VmCellSlice` +// + +struct VmCellSlice final : TLB_Complex { + enum { cons1 }; + static constexpr int cons_len_exact = 0; + struct Record; + int get_size(const vm::CellSlice& cs) const override { + return 0x1001a; + } + bool skip(vm::CellSlice& cs) const override { + return cs.advance_ext(0x1001a); + } + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmCellSlice"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +struct VmCellSlice::Record { + typedef VmCellSlice type_class; + Ref cell; // cell : ^Cell + int st_bits; // st_bits : ## 10 + int end_bits; // end_bits : ## 10 + int st_ref; // st_ref : #<= 4 + int end_ref; // end_ref : #<= 4 + Record() = default; + Record(Ref _cell, int _st_bits, int _end_bits, int _st_ref, int _end_ref) : cell(std::move(_cell)), st_bits(_st_bits), end_bits(_end_bits), st_ref(_st_ref), end_ref(_end_ref) {} +}; + +extern const VmCellSlice t_VmCellSlice; + +// +// headers for type `VmTupleRef` +// + +struct VmTupleRef final : TLB_Complex { + enum { vm_tupref_nil, vm_tupref_single, vm_tupref_any }; + static constexpr int cons_len_exact = 0; + int m_; + VmTupleRef(int m) : m_(m) {} + struct Record_vm_tupref_nil { + typedef VmTupleRef type_class; + }; + struct Record_vm_tupref_single { + typedef VmTupleRef type_class; + Ref entry; // entry : ^VmStackValue + Record_vm_tupref_single() = default; + Record_vm_tupref_single(Ref _entry) : entry(std::move(_entry)) {} + }; + struct Record_vm_tupref_any { + typedef VmTupleRef type_class; + int n; // n : # + Ref ref; // ref : ^(VmTuple (n + 2)) + Record_vm_tupref_any() = default; + Record_vm_tupref_any(Ref _ref) : n(-1), ref(std::move(_ref)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_vm_tupref_nil& data) const; + bool unpack_vm_tupref_nil(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_vm_tupref_nil& data) const; + bool cell_unpack_vm_tupref_nil(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_vm_tupref_nil& data) const; + bool pack_vm_tupref_nil(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_vm_tupref_nil& data) const; + bool cell_pack_vm_tupref_nil(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_vm_tupref_single& data) const; + bool unpack_vm_tupref_single(vm::CellSlice& cs, Ref& entry) const; + bool cell_unpack(Ref cell_ref, Record_vm_tupref_single& data) const; + bool cell_unpack_vm_tupref_single(Ref cell_ref, Ref& entry) const; + bool pack(vm::CellBuilder& cb, const Record_vm_tupref_single& data) const; + bool pack_vm_tupref_single(vm::CellBuilder& cb, Ref entry) const; + bool cell_pack(Ref& cell_ref, const Record_vm_tupref_single& data) const; + bool cell_pack_vm_tupref_single(Ref& cell_ref, Ref entry) const; + bool unpack(vm::CellSlice& cs, Record_vm_tupref_any& data) const; + bool unpack_vm_tupref_any(vm::CellSlice& cs, int& n, Ref& ref) const; + bool cell_unpack(Ref cell_ref, Record_vm_tupref_any& data) const; + bool cell_unpack_vm_tupref_any(Ref cell_ref, int& n, Ref& ref) const; + bool pack(vm::CellBuilder& cb, const Record_vm_tupref_any& data) const; + bool pack_vm_tupref_any(vm::CellBuilder& cb, Ref ref) const; + bool cell_pack(Ref& cell_ref, const Record_vm_tupref_any& data) const; + bool cell_pack_vm_tupref_any(Ref& cell_ref, Ref ref) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "(VmTupleRef " << m_ << ")"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override; +}; + +// +// headers for type `VmTuple` +// + +struct VmTuple final : TLB_Complex { + enum { vm_tuple_nil, vm_tuple_tcons }; + static constexpr int cons_len_exact = 0; + int m_; + VmTuple(int m) : m_(m) {} + struct Record_vm_tuple_nil { + typedef VmTuple type_class; + }; + struct Record_vm_tuple_tcons; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_vm_tuple_nil& data) const; + bool unpack_vm_tuple_nil(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_vm_tuple_nil& data) const; + bool cell_unpack_vm_tuple_nil(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_vm_tuple_nil& data) const; + bool pack_vm_tuple_nil(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_vm_tuple_nil& data) const; + bool cell_pack_vm_tuple_nil(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_vm_tuple_tcons& data) const; + bool unpack_vm_tuple_tcons(vm::CellSlice& cs, int& n, Ref& head, Ref& tail) const; + bool cell_unpack(Ref cell_ref, Record_vm_tuple_tcons& data) const; + bool cell_unpack_vm_tuple_tcons(Ref cell_ref, int& n, Ref& head, Ref& tail) const; + bool pack(vm::CellBuilder& cb, const Record_vm_tuple_tcons& data) const; + bool pack_vm_tuple_tcons(vm::CellBuilder& cb, Ref head, Ref tail) const; + bool cell_pack(Ref& cell_ref, const Record_vm_tuple_tcons& data) const; + bool cell_pack_vm_tuple_tcons(Ref& cell_ref, Ref head, Ref tail) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "(VmTuple " << m_ << ")"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override; +}; + +struct VmTuple::Record_vm_tuple_tcons { + typedef VmTuple type_class; + int n; // n : # + Ref head; // head : VmTupleRef n + Ref tail; // tail : ^VmStackValue + Record_vm_tuple_tcons() = default; + Record_vm_tuple_tcons(Ref _head, Ref _tail) : n(-1), head(std::move(_head)), tail(std::move(_tail)) {} +}; + +// +// headers for type `VmStackValue` +// + +struct VmStackValue final : TLB_Complex { + enum { vm_stk_null, vm_stk_tinyint, vm_stk_int, vm_stk_nan, vm_stk_cell, vm_stk_slice, vm_stk_builder, vm_stk_cont, vm_stk_tuple }; + static constexpr char cons_len[9] = { 8, 8, 15, 16, 8, 8, 8, 8, 8 }; + static constexpr unsigned short cons_tag[9] = { 0, 1, 0x100, 0x2ff, 3, 4, 5, 6, 7 }; + struct Record_vm_stk_null { + typedef VmStackValue type_class; + }; + struct Record_vm_stk_tinyint { + typedef VmStackValue type_class; + long long value; // value : int64 + Record_vm_stk_tinyint() = default; + Record_vm_stk_tinyint(long long _value) : value(_value) {} + }; + struct Record_vm_stk_int { + typedef VmStackValue type_class; + RefInt256 value; // value : int257 + Record_vm_stk_int() = default; + Record_vm_stk_int(RefInt256 _value) : value(std::move(_value)) {} + }; + struct Record_vm_stk_nan { + typedef VmStackValue type_class; + }; + struct Record_vm_stk_cell { + typedef VmStackValue type_class; + Ref cell; // cell : ^Cell + Record_vm_stk_cell() = default; + Record_vm_stk_cell(Ref _cell) : cell(std::move(_cell)) {} + }; + struct Record_vm_stk_slice { + typedef VmStackValue type_class; + Ref x; // VmCellSlice + Record_vm_stk_slice() = default; + Record_vm_stk_slice(Ref _x) : x(std::move(_x)) {} + }; + struct Record_vm_stk_builder { + typedef VmStackValue type_class; + Ref cell; // cell : ^Cell + Record_vm_stk_builder() = default; + Record_vm_stk_builder(Ref _cell) : cell(std::move(_cell)) {} + }; + struct Record_vm_stk_cont { + typedef VmStackValue type_class; + Ref cont; // cont : VmCont + Record_vm_stk_cont() = default; + Record_vm_stk_cont(Ref _cont) : cont(std::move(_cont)) {} + }; + struct Record_vm_stk_tuple { + typedef VmStackValue type_class; + int len; // len : ## 16 + Ref data; // data : VmTuple len + Record_vm_stk_tuple() = default; + Record_vm_stk_tuple(int _len, Ref _data) : len(_len), data(std::move(_data)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_vm_stk_null& data) const; + bool unpack_vm_stk_null(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_null& data) const; + bool cell_unpack_vm_stk_null(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_null& data) const; + bool pack_vm_stk_null(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_null& data) const; + bool cell_pack_vm_stk_null(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_tinyint& data) const; + bool unpack_vm_stk_tinyint(vm::CellSlice& cs, long long& value) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_tinyint& data) const; + bool cell_unpack_vm_stk_tinyint(Ref cell_ref, long long& value) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_tinyint& data) const; + bool pack_vm_stk_tinyint(vm::CellBuilder& cb, long long value) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_tinyint& data) const; + bool cell_pack_vm_stk_tinyint(Ref& cell_ref, long long value) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_int& data) const; + bool unpack_vm_stk_int(vm::CellSlice& cs, RefInt256& value) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_int& data) const; + bool cell_unpack_vm_stk_int(Ref cell_ref, RefInt256& value) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_int& data) const; + bool pack_vm_stk_int(vm::CellBuilder& cb, RefInt256 value) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_int& data) const; + bool cell_pack_vm_stk_int(Ref& cell_ref, RefInt256 value) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_nan& data) const; + bool unpack_vm_stk_nan(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_nan& data) const; + bool cell_unpack_vm_stk_nan(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_nan& data) const; + bool pack_vm_stk_nan(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_nan& data) const; + bool cell_pack_vm_stk_nan(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_cell& data) const; + bool unpack_vm_stk_cell(vm::CellSlice& cs, Ref& cell) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_cell& data) const; + bool cell_unpack_vm_stk_cell(Ref cell_ref, Ref& cell) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_cell& data) const; + bool pack_vm_stk_cell(vm::CellBuilder& cb, Ref cell) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_cell& data) const; + bool cell_pack_vm_stk_cell(Ref& cell_ref, Ref cell) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_slice& data) const; + bool unpack_vm_stk_slice(vm::CellSlice& cs, Ref& x) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_slice& data) const; + bool cell_unpack_vm_stk_slice(Ref cell_ref, Ref& x) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_slice& data) const; + bool pack_vm_stk_slice(vm::CellBuilder& cb, Ref x) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_slice& data) const; + bool cell_pack_vm_stk_slice(Ref& cell_ref, Ref x) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_builder& data) const; + bool unpack_vm_stk_builder(vm::CellSlice& cs, Ref& cell) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_builder& data) const; + bool cell_unpack_vm_stk_builder(Ref cell_ref, Ref& cell) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_builder& data) const; + bool pack_vm_stk_builder(vm::CellBuilder& cb, Ref cell) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_builder& data) const; + bool cell_pack_vm_stk_builder(Ref& cell_ref, Ref cell) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_cont& data) const; + bool unpack_vm_stk_cont(vm::CellSlice& cs, Ref& cont) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_cont& data) const; + bool cell_unpack_vm_stk_cont(Ref cell_ref, Ref& cont) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_cont& data) const; + bool pack_vm_stk_cont(vm::CellBuilder& cb, Ref cont) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_cont& data) const; + bool cell_pack_vm_stk_cont(Ref& cell_ref, Ref cont) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_tuple& data) const; + bool unpack_vm_stk_tuple(vm::CellSlice& cs, int& len, Ref& data) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_tuple& data) const; + bool cell_unpack_vm_stk_tuple(Ref cell_ref, int& len, Ref& data) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_tuple& data) const; + bool pack_vm_stk_tuple(vm::CellBuilder& cb, int len, Ref data) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_tuple& data) const; + bool cell_pack_vm_stk_tuple(Ref& cell_ref, int len, Ref data) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmStackValue"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override; +}; + +extern const VmStackValue t_VmStackValue; + +// +// headers for type `VmStack` +// + +struct VmStack final : TLB_Complex { + enum { vm_stack }; + static constexpr int cons_len_exact = 0; + struct Record { + typedef VmStack type_class; + int depth; // depth : ## 24 + Ref stack; // stack : VmStackList depth + Record() = default; + Record(int _depth, Ref _stack) : depth(_depth), stack(std::move(_stack)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_vm_stack(vm::CellSlice& cs, int& depth, Ref& stack) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_vm_stack(Ref cell_ref, int& depth, Ref& stack) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_vm_stack(vm::CellBuilder& cb, int depth, Ref stack) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_vm_stack(Ref& cell_ref, int depth, Ref stack) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmStack"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const VmStack t_VmStack; + +// +// headers for type `VmStackList` +// + +struct VmStackList final : TLB_Complex { + enum { vm_stk_cons, vm_stk_nil }; + static constexpr int cons_len_exact = 0; + int m_; + VmStackList(int m) : m_(m) {} + struct Record_vm_stk_cons; + struct Record_vm_stk_nil { + typedef VmStackList type_class; + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_vm_stk_cons& data) const; + bool unpack_vm_stk_cons(vm::CellSlice& cs, int& n, Ref& rest, Ref& tos) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_cons& data) const; + bool cell_unpack_vm_stk_cons(Ref cell_ref, int& n, Ref& rest, Ref& tos) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_cons& data) const; + bool pack_vm_stk_cons(vm::CellBuilder& cb, Ref rest, Ref tos) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_cons& data) const; + bool cell_pack_vm_stk_cons(Ref& cell_ref, Ref rest, Ref tos) const; + bool unpack(vm::CellSlice& cs, Record_vm_stk_nil& data) const; + bool unpack_vm_stk_nil(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_vm_stk_nil& data) const; + bool cell_unpack_vm_stk_nil(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_vm_stk_nil& data) const; + bool pack_vm_stk_nil(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_vm_stk_nil& data) const; + bool cell_pack_vm_stk_nil(Ref& cell_ref) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "(VmStackList " << m_ << ")"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override; +}; + +struct VmStackList::Record_vm_stk_cons { + typedef VmStackList type_class; + int n; // n : # + Ref rest; // rest : ^(VmStackList n) + Ref tos; // tos : VmStackValue + Record_vm_stk_cons() = default; + Record_vm_stk_cons(Ref _rest, Ref _tos) : n(-1), rest(std::move(_rest)), tos(std::move(_tos)) {} +}; + +// +// headers for type `VmSaveList` +// + +struct VmSaveList final : TLB_Complex { + enum { cons1 }; + static constexpr int cons_len_exact = 0; + struct Record { + typedef VmSaveList type_class; + Ref cregs; // cregs : HashmapE 4 VmStackValue + Record() = default; + Record(Ref _cregs) : cregs(std::move(_cregs)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_cons1(vm::CellSlice& cs, Ref& cregs) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_cons1(Ref cell_ref, Ref& cregs) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_cons1(vm::CellBuilder& cb, Ref cregs) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_cons1(Ref& cell_ref, Ref cregs) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmSaveList"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const VmSaveList t_VmSaveList; + +// +// headers for auxiliary type `VmGasLimits_aux` +// + +struct VmGasLimits_aux final : TLB_Complex { + enum { cons1 }; + static constexpr int cons_len_exact = 0; + struct Record; + int get_size(const vm::CellSlice& cs) const override { + return 192; + } + bool skip(vm::CellSlice& cs) const override { + return cs.advance(192); + } + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return cs.advance(192); + } + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_cons1(vm::CellSlice& cs, long long& max_limit, long long& cur_limit, long long& credit) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_cons1(Ref cell_ref, long long& max_limit, long long& cur_limit, long long& credit) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_cons1(vm::CellBuilder& cb, long long max_limit, long long cur_limit, long long credit) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_cons1(Ref& cell_ref, long long max_limit, long long cur_limit, long long credit) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmGasLimits_aux"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +struct VmGasLimits_aux::Record { + typedef VmGasLimits_aux type_class; + long long max_limit; // max_limit : int64 + long long cur_limit; // cur_limit : int64 + long long credit; // credit : int64 + Record() = default; + Record(long long _max_limit, long long _cur_limit, long long _credit) : max_limit(_max_limit), cur_limit(_cur_limit), credit(_credit) {} +}; + +extern const VmGasLimits_aux t_VmGasLimits_aux; + +// +// headers for type `VmGasLimits` +// + +struct VmGasLimits final : TLB_Complex { + enum { gas_limits }; + static constexpr int cons_len_exact = 0; + struct Record { + typedef VmGasLimits type_class; + long long remaining; // remaining : int64 + VmGasLimits_aux::Record r1; // ^[$_ max_limit:int64 cur_limit:int64 credit:int64 ] + Record() = default; + Record(long long _remaining, const VmGasLimits_aux::Record& _r1) : remaining(_remaining), r1(_r1) {} + }; + int get_size(const vm::CellSlice& cs) const override { + return 0x10040; + } + bool skip(vm::CellSlice& cs) const override { + return cs.advance_ext(0x10040); + } + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmGasLimits"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const VmGasLimits t_VmGasLimits; + +// +// headers for type `VmLibraries` +// + +struct VmLibraries final : TLB_Complex { + enum { cons1 }; + static constexpr int cons_len_exact = 0; + struct Record { + typedef VmLibraries type_class; + Ref libraries; // libraries : HashmapE 256 ^Cell + Record() = default; + Record(Ref _libraries) : libraries(std::move(_libraries)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_cons1(vm::CellSlice& cs, Ref& libraries) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_cons1(Ref cell_ref, Ref& libraries) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_cons1(vm::CellBuilder& cb, Ref libraries) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_cons1(Ref& cell_ref, Ref libraries) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmLibraries"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const VmLibraries t_VmLibraries; + +// +// headers for type `VmControlData` +// + +struct VmControlData final : TLB_Complex { + enum { vm_ctl_data }; + static constexpr int cons_len_exact = 0; + struct Record; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmControlData"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +struct VmControlData::Record { + typedef VmControlData type_class; + Ref nargs; // nargs : Maybe uint13 + Ref stack; // stack : Maybe VmStack + Ref save; // save : VmSaveList + Ref cp; // cp : Maybe int16 + Record() = default; + Record(Ref _nargs, Ref _stack, Ref _save, Ref _cp) : nargs(std::move(_nargs)), stack(std::move(_stack)), save(std::move(_save)), cp(std::move(_cp)) {} +}; + +extern const VmControlData t_VmControlData; + +// +// headers for type `VmCont` +// + +struct VmCont final : TLB_Complex { + enum { vmc_std, vmc_envelope, vmc_quit, vmc_quit_exc, vmc_repeat, vmc_until, vmc_again, vmc_while_cond, vmc_while_body, vmc_pushint }; + static constexpr char cons_len[10] = { 2, 2, 4, 4, 5, 6, 6, 6, 6, 4 }; + static constexpr unsigned char cons_tag[10] = { 0, 1, 8, 9, 20, 0x30, 0x31, 0x32, 0x33, 15 }; + struct Record_vmc_std { + typedef VmCont type_class; + Ref cdata; // cdata : VmControlData + Ref code; // code : VmCellSlice + Record_vmc_std() = default; + Record_vmc_std(Ref _cdata, Ref _code) : cdata(std::move(_cdata)), code(std::move(_code)) {} + }; + struct Record_vmc_envelope { + typedef VmCont type_class; + Ref cdata; // cdata : VmControlData + Ref next; // next : ^VmCont + Record_vmc_envelope() = default; + Record_vmc_envelope(Ref _cdata, Ref _next) : cdata(std::move(_cdata)), next(std::move(_next)) {} + }; + struct Record_vmc_quit { + typedef VmCont type_class; + int exit_code; // exit_code : int32 + Record_vmc_quit() = default; + Record_vmc_quit(int _exit_code) : exit_code(_exit_code) {} + }; + struct Record_vmc_quit_exc { + typedef VmCont type_class; + }; + struct Record_vmc_repeat; + struct Record_vmc_until { + typedef VmCont type_class; + Ref body; // body : ^VmCont + Ref after; // after : ^VmCont + Record_vmc_until() = default; + Record_vmc_until(Ref _body, Ref _after) : body(std::move(_body)), after(std::move(_after)) {} + }; + struct Record_vmc_again { + typedef VmCont type_class; + Ref body; // body : ^VmCont + Record_vmc_again() = default; + Record_vmc_again(Ref _body) : body(std::move(_body)) {} + }; + struct Record_vmc_while_cond; + struct Record_vmc_while_body; + struct Record_vmc_pushint { + typedef VmCont type_class; + int value; // value : int32 + Ref next; // next : ^VmCont + Record_vmc_pushint() = default; + Record_vmc_pushint(int _value, Ref _next) : value(_value), next(std::move(_next)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_vmc_std& data) const; + bool unpack_vmc_std(vm::CellSlice& cs, Ref& cdata, Ref& code) const; + bool cell_unpack(Ref cell_ref, Record_vmc_std& data) const; + bool cell_unpack_vmc_std(Ref cell_ref, Ref& cdata, Ref& code) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_std& data) const; + bool pack_vmc_std(vm::CellBuilder& cb, Ref cdata, Ref code) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_std& data) const; + bool cell_pack_vmc_std(Ref& cell_ref, Ref cdata, Ref code) const; + bool unpack(vm::CellSlice& cs, Record_vmc_envelope& data) const; + bool unpack_vmc_envelope(vm::CellSlice& cs, Ref& cdata, Ref& next) const; + bool cell_unpack(Ref cell_ref, Record_vmc_envelope& data) const; + bool cell_unpack_vmc_envelope(Ref cell_ref, Ref& cdata, Ref& next) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_envelope& data) const; + bool pack_vmc_envelope(vm::CellBuilder& cb, Ref cdata, Ref next) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_envelope& data) const; + bool cell_pack_vmc_envelope(Ref& cell_ref, Ref cdata, Ref next) const; + bool unpack(vm::CellSlice& cs, Record_vmc_quit& data) const; + bool unpack_vmc_quit(vm::CellSlice& cs, int& exit_code) const; + bool cell_unpack(Ref cell_ref, Record_vmc_quit& data) const; + bool cell_unpack_vmc_quit(Ref cell_ref, int& exit_code) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_quit& data) const; + bool pack_vmc_quit(vm::CellBuilder& cb, int exit_code) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_quit& data) const; + bool cell_pack_vmc_quit(Ref& cell_ref, int exit_code) const; + bool unpack(vm::CellSlice& cs, Record_vmc_quit_exc& data) const; + bool unpack_vmc_quit_exc(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_vmc_quit_exc& data) const; + bool cell_unpack_vmc_quit_exc(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_quit_exc& data) const; + bool pack_vmc_quit_exc(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_quit_exc& data) const; + bool cell_pack_vmc_quit_exc(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_vmc_repeat& data) const; + bool unpack_vmc_repeat(vm::CellSlice& cs, long long& count, Ref& body, Ref& after) const; + bool cell_unpack(Ref cell_ref, Record_vmc_repeat& data) const; + bool cell_unpack_vmc_repeat(Ref cell_ref, long long& count, Ref& body, Ref& after) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_repeat& data) const; + bool pack_vmc_repeat(vm::CellBuilder& cb, long long count, Ref body, Ref after) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_repeat& data) const; + bool cell_pack_vmc_repeat(Ref& cell_ref, long long count, Ref body, Ref after) const; + bool unpack(vm::CellSlice& cs, Record_vmc_until& data) const; + bool unpack_vmc_until(vm::CellSlice& cs, Ref& body, Ref& after) const; + bool cell_unpack(Ref cell_ref, Record_vmc_until& data) const; + bool cell_unpack_vmc_until(Ref cell_ref, Ref& body, Ref& after) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_until& data) const; + bool pack_vmc_until(vm::CellBuilder& cb, Ref body, Ref after) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_until& data) const; + bool cell_pack_vmc_until(Ref& cell_ref, Ref body, Ref after) const; + bool unpack(vm::CellSlice& cs, Record_vmc_again& data) const; + bool unpack_vmc_again(vm::CellSlice& cs, Ref& body) const; + bool cell_unpack(Ref cell_ref, Record_vmc_again& data) const; + bool cell_unpack_vmc_again(Ref cell_ref, Ref& body) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_again& data) const; + bool pack_vmc_again(vm::CellBuilder& cb, Ref body) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_again& data) const; + bool cell_pack_vmc_again(Ref& cell_ref, Ref body) const; + bool unpack(vm::CellSlice& cs, Record_vmc_while_cond& data) const; + bool unpack_vmc_while_cond(vm::CellSlice& cs, Ref& cond, Ref& body, Ref& after) const; + bool cell_unpack(Ref cell_ref, Record_vmc_while_cond& data) const; + bool cell_unpack_vmc_while_cond(Ref cell_ref, Ref& cond, Ref& body, Ref& after) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_while_cond& data) const; + bool pack_vmc_while_cond(vm::CellBuilder& cb, Ref cond, Ref body, Ref after) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_while_cond& data) const; + bool cell_pack_vmc_while_cond(Ref& cell_ref, Ref cond, Ref body, Ref after) const; + bool unpack(vm::CellSlice& cs, Record_vmc_while_body& data) const; + bool unpack_vmc_while_body(vm::CellSlice& cs, Ref& cond, Ref& body, Ref& after) const; + bool cell_unpack(Ref cell_ref, Record_vmc_while_body& data) const; + bool cell_unpack_vmc_while_body(Ref cell_ref, Ref& cond, Ref& body, Ref& after) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_while_body& data) const; + bool pack_vmc_while_body(vm::CellBuilder& cb, Ref cond, Ref body, Ref after) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_while_body& data) const; + bool cell_pack_vmc_while_body(Ref& cell_ref, Ref cond, Ref body, Ref after) const; + bool unpack(vm::CellSlice& cs, Record_vmc_pushint& data) const; + bool unpack_vmc_pushint(vm::CellSlice& cs, int& value, Ref& next) const; + bool cell_unpack(Ref cell_ref, Record_vmc_pushint& data) const; + bool cell_unpack_vmc_pushint(Ref cell_ref, int& value, Ref& next) const; + bool pack(vm::CellBuilder& cb, const Record_vmc_pushint& data) const; + bool pack_vmc_pushint(vm::CellBuilder& cb, int value, Ref next) const; + bool cell_pack(Ref& cell_ref, const Record_vmc_pushint& data) const; + bool cell_pack_vmc_pushint(Ref& cell_ref, int value, Ref next) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "VmCont"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return cs.bselect_ext(6, 0x100f011100010001ULL); + } +}; + +struct VmCont::Record_vmc_repeat { + typedef VmCont type_class; + long long count; // count : uint63 + Ref body; // body : ^VmCont + Ref after; // after : ^VmCont + Record_vmc_repeat() = default; + Record_vmc_repeat(long long _count, Ref _body, Ref _after) : count(_count), body(std::move(_body)), after(std::move(_after)) {} +}; + +struct VmCont::Record_vmc_while_cond { + typedef VmCont type_class; + Ref cond; // cond : ^VmCont + Ref body; // body : ^VmCont + Ref after; // after : ^VmCont + Record_vmc_while_cond() = default; + Record_vmc_while_cond(Ref _cond, Ref _body, Ref _after) : cond(std::move(_cond)), body(std::move(_body)), after(std::move(_after)) {} +}; + +struct VmCont::Record_vmc_while_body { + typedef VmCont type_class; + Ref cond; // cond : ^VmCont + Ref body; // body : ^VmCont + Ref after; // after : ^VmCont + Record_vmc_while_body() = default; + Record_vmc_while_body(Ref _cond, Ref _body, Ref _after) : cond(std::move(_cond)), body(std::move(_body)), after(std::move(_after)) {} +}; + +extern const VmCont t_VmCont; + +// +// headers for type `DNS_RecordSet` +// + +struct DNS_RecordSet final : TLB_Complex { + enum { cons1 }; + static constexpr int cons_len_exact = 0; + struct Record { + typedef DNS_RecordSet type_class; + Ref x; // HashmapE 16 ^DNSRecord + Record() = default; + Record(Ref _x) : x(std::move(_x)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_cons1(vm::CellSlice& cs, Ref& x) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_cons1(Ref cell_ref, Ref& x) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_cons1(vm::CellBuilder& cb, Ref x) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_cons1(Ref& cell_ref, Ref x) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "DNS_RecordSet"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const DNS_RecordSet t_DNS_RecordSet; + +// +// headers for type `TextChunkRef` +// + +struct TextChunkRef final : TLB_Complex { + enum { chunk_ref, chunk_ref_empty }; + static constexpr int cons_len_exact = 0; + int m_; + TextChunkRef(int m) : m_(m) {} + struct Record_chunk_ref { + typedef TextChunkRef type_class; + int n; // n : # + Ref ref; // ref : ^(TextChunks (n + 1)) + Record_chunk_ref() = default; + Record_chunk_ref(Ref _ref) : n(-1), ref(std::move(_ref)) {} + }; + struct Record_chunk_ref_empty { + typedef TextChunkRef type_class; + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_chunk_ref& data) const; + bool unpack_chunk_ref(vm::CellSlice& cs, int& n, Ref& ref) const; + bool cell_unpack(Ref cell_ref, Record_chunk_ref& data) const; + bool cell_unpack_chunk_ref(Ref cell_ref, int& n, Ref& ref) const; + bool pack(vm::CellBuilder& cb, const Record_chunk_ref& data) const; + bool pack_chunk_ref(vm::CellBuilder& cb, Ref ref) const; + bool cell_pack(Ref& cell_ref, const Record_chunk_ref& data) const; + bool cell_pack_chunk_ref(Ref& cell_ref, Ref ref) const; + bool unpack(vm::CellSlice& cs, Record_chunk_ref_empty& data) const; + bool unpack_chunk_ref_empty(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_chunk_ref_empty& data) const; + bool cell_unpack_chunk_ref_empty(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_chunk_ref_empty& data) const; + bool pack_chunk_ref_empty(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_chunk_ref_empty& data) const; + bool cell_pack_chunk_ref_empty(Ref& cell_ref) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "(TextChunkRef " << m_ << ")"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override; +}; + +// +// headers for type `TextChunks` +// + +struct TextChunks final : TLB_Complex { + enum { text_chunk, text_chunk_empty }; + static constexpr int cons_len_exact = 0; + int m_; + TextChunks(int m) : m_(m) {} + struct Record_text_chunk; + struct Record_text_chunk_empty { + typedef TextChunks type_class; + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_text_chunk& data) const; + bool cell_unpack(Ref cell_ref, Record_text_chunk& data) const; + bool pack(vm::CellBuilder& cb, const Record_text_chunk& data) const; + bool cell_pack(Ref& cell_ref, const Record_text_chunk& data) const; + bool unpack(vm::CellSlice& cs, Record_text_chunk_empty& data) const; + bool unpack_text_chunk_empty(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_text_chunk_empty& data) const; + bool cell_unpack_text_chunk_empty(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_text_chunk_empty& data) const; + bool pack_text_chunk_empty(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_text_chunk_empty& data) const; + bool cell_pack_text_chunk_empty(Ref& cell_ref) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "(TextChunks " << m_ << ")"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override; +}; + +struct TextChunks::Record_text_chunk { + typedef TextChunks type_class; + int n; // n : # + int len; // len : ## 8 + Ref data; // data : bits (8 * len) + Ref next; // next : TextChunkRef n + Record_text_chunk() = default; + Record_text_chunk(int _len, Ref _data, Ref _next) : n(-1), len(_len), data(std::move(_data)), next(std::move(_next)) {} +}; + +// +// headers for type `Text` +// + +struct Text final : TLB_Complex { + enum { text }; + static constexpr int cons_len_exact = 0; + struct Record { + typedef Text type_class; + int chunks; // chunks : ## 8 + Ref rest; // rest : TextChunks chunks + Record() = default; + Record(int _chunks, Ref _rest) : chunks(_chunks), rest(std::move(_rest)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_text(vm::CellSlice& cs, int& chunks, Ref& rest) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_text(Ref cell_ref, int& chunks, Ref& rest) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_text(vm::CellBuilder& cb, int chunks, Ref rest) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_text(Ref& cell_ref, int chunks, Ref rest) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "Text"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const Text t_Text; + +// +// headers for type `ProtoList` +// + +struct ProtoList final : TLB_Complex { + enum { proto_list_nil, proto_list_next }; + static constexpr int cons_len_exact = 1; + struct Record_proto_list_nil { + typedef ProtoList type_class; + }; + struct Record_proto_list_next { + typedef ProtoList type_class; + char head; // head : Protocol + Ref tail; // tail : ProtoList + Record_proto_list_next() = default; + Record_proto_list_next(char _head, Ref _tail) : head(_head), tail(std::move(_tail)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_proto_list_nil& data) const; + bool unpack_proto_list_nil(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_proto_list_nil& data) const; + bool cell_unpack_proto_list_nil(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_proto_list_nil& data) const; + bool pack_proto_list_nil(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_proto_list_nil& data) const; + bool cell_pack_proto_list_nil(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_proto_list_next& data) const; + bool unpack_proto_list_next(vm::CellSlice& cs, char& head, Ref& tail) const; + bool cell_unpack(Ref cell_ref, Record_proto_list_next& data) const; + bool cell_unpack_proto_list_next(Ref cell_ref, char& head, Ref& tail) const; + bool pack(vm::CellBuilder& cb, const Record_proto_list_next& data) const; + bool pack_proto_list_next(vm::CellBuilder& cb, char head, Ref tail) const; + bool cell_pack(Ref& cell_ref, const Record_proto_list_next& data) const; + bool cell_pack_proto_list_next(Ref& cell_ref, char head, Ref tail) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "ProtoList"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return (int)cs.prefetch_ulong(1); + } +}; + +extern const ProtoList t_ProtoList; + +// +// headers for type `Protocol` +// + +struct Protocol final : TLB_Complex { + enum { proto_http }; + static constexpr int cons_len_exact = 16; + static constexpr unsigned short cons_tag[1] = { 0x4854 }; + struct Record { + typedef Protocol type_class; + }; + int get_size(const vm::CellSlice& cs) const override { + return 16; + } + bool skip(vm::CellSlice& cs) const override { + return cs.advance(16); + } + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool fetch_enum_to(vm::CellSlice& cs, char& value) const; + bool store_enum_from(vm::CellBuilder& cb, int value) const; + bool unpack(vm::CellSlice& cs, Record& data) const; + bool unpack_proto_http(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record& data) const; + bool cell_unpack_proto_http(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record& data) const; + bool pack_proto_http(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record& data) const; + bool cell_pack_proto_http(Ref& cell_ref) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "Protocol"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return 0; + } +}; + +extern const Protocol t_Protocol; + +// +// headers for type `DNSRecord` +// + +struct DNSRecord final : TLB_Complex { + enum { dns_text, dns_smc_address, dns_adnl_address, dns_next_resolver }; + static constexpr int cons_len_exact = 16; + static constexpr unsigned short cons_tag[4] = { 0x1eda, 0x9fd3, 0xad01, 0xba93 }; + struct Record_dns_text { + typedef DNSRecord type_class; + Ref x; // Text + Record_dns_text() = default; + Record_dns_text(Ref _x) : x(std::move(_x)) {} + }; + struct Record_dns_next_resolver { + typedef DNSRecord type_class; + Ref resolver; // resolver : MsgAddressInt + Record_dns_next_resolver() = default; + Record_dns_next_resolver(Ref _resolver) : resolver(std::move(_resolver)) {} + }; + struct Record_dns_adnl_address; + struct Record_dns_smc_address; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_dns_text& data) const; + bool unpack_dns_text(vm::CellSlice& cs, Ref& x) const; + bool cell_unpack(Ref cell_ref, Record_dns_text& data) const; + bool cell_unpack_dns_text(Ref cell_ref, Ref& x) const; + bool pack(vm::CellBuilder& cb, const Record_dns_text& data) const; + bool pack_dns_text(vm::CellBuilder& cb, Ref x) const; + bool cell_pack(Ref& cell_ref, const Record_dns_text& data) const; + bool cell_pack_dns_text(Ref& cell_ref, Ref x) const; + bool unpack(vm::CellSlice& cs, Record_dns_next_resolver& data) const; + bool unpack_dns_next_resolver(vm::CellSlice& cs, Ref& resolver) const; + bool cell_unpack(Ref cell_ref, Record_dns_next_resolver& data) const; + bool cell_unpack_dns_next_resolver(Ref cell_ref, Ref& resolver) const; + bool pack(vm::CellBuilder& cb, const Record_dns_next_resolver& data) const; + bool pack_dns_next_resolver(vm::CellBuilder& cb, Ref resolver) const; + bool cell_pack(Ref& cell_ref, const Record_dns_next_resolver& data) const; + bool cell_pack_dns_next_resolver(Ref& cell_ref, Ref resolver) const; + bool unpack(vm::CellSlice& cs, Record_dns_adnl_address& data) const; + bool unpack_dns_adnl_address(vm::CellSlice& cs, td::BitArray<256>& adnl_addr, int& flags, Ref& proto_list) const; + bool cell_unpack(Ref cell_ref, Record_dns_adnl_address& data) const; + bool cell_unpack_dns_adnl_address(Ref cell_ref, td::BitArray<256>& adnl_addr, int& flags, Ref& proto_list) const; + bool pack(vm::CellBuilder& cb, const Record_dns_adnl_address& data) const; + bool pack_dns_adnl_address(vm::CellBuilder& cb, td::BitArray<256> adnl_addr, int flags, Ref proto_list) const; + bool cell_pack(Ref& cell_ref, const Record_dns_adnl_address& data) const; + bool cell_pack_dns_adnl_address(Ref& cell_ref, td::BitArray<256> adnl_addr, int flags, Ref proto_list) const; + bool unpack(vm::CellSlice& cs, Record_dns_smc_address& data) const; + bool unpack_dns_smc_address(vm::CellSlice& cs, Ref& smc_addr, int& flags, Ref& cap_list) const; + bool cell_unpack(Ref cell_ref, Record_dns_smc_address& data) const; + bool cell_unpack_dns_smc_address(Ref cell_ref, Ref& smc_addr, int& flags, Ref& cap_list) const; + bool pack(vm::CellBuilder& cb, const Record_dns_smc_address& data) const; + bool pack_dns_smc_address(vm::CellBuilder& cb, Ref smc_addr, int flags, Ref cap_list) const; + bool cell_pack(Ref& cell_ref, const Record_dns_smc_address& data) const; + bool cell_pack_dns_smc_address(Ref& cell_ref, Ref smc_addr, int flags, Ref cap_list) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "DNSRecord"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return cs.bselect(4, 0xe02); + } +}; + +struct DNSRecord::Record_dns_adnl_address { + typedef DNSRecord type_class; + td::BitArray<256> adnl_addr; // adnl_addr : bits256 + int flags; // flags : ## 8 + Ref proto_list; // proto_list : flags.0?ProtoList + Record_dns_adnl_address() = default; + Record_dns_adnl_address(const td::BitArray<256>& _adnl_addr, int _flags, Ref _proto_list) : adnl_addr(_adnl_addr), flags(_flags), proto_list(std::move(_proto_list)) {} +}; + +struct DNSRecord::Record_dns_smc_address { + typedef DNSRecord type_class; + Ref smc_addr; // smc_addr : MsgAddressInt + int flags; // flags : ## 8 + Ref cap_list; // cap_list : flags.0?SmcCapList + Record_dns_smc_address() = default; + Record_dns_smc_address(Ref _smc_addr, int _flags, Ref _cap_list) : smc_addr(std::move(_smc_addr)), flags(_flags), cap_list(std::move(_cap_list)) {} +}; + +extern const DNSRecord t_DNSRecord; + +// +// headers for type `SmcCapList` +// + +struct SmcCapList final : TLB_Complex { + enum { cap_list_nil, cap_list_next }; + static constexpr int cons_len_exact = 1; + struct Record_cap_list_nil { + typedef SmcCapList type_class; + }; + struct Record_cap_list_next { + typedef SmcCapList type_class; + Ref head; // head : SmcCapability + Ref tail; // tail : SmcCapList + Record_cap_list_next() = default; + Record_cap_list_next(Ref _head, Ref _tail) : head(std::move(_head)), tail(std::move(_tail)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_cap_list_nil& data) const; + bool unpack_cap_list_nil(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_cap_list_nil& data) const; + bool cell_unpack_cap_list_nil(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_cap_list_nil& data) const; + bool pack_cap_list_nil(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_cap_list_nil& data) const; + bool cell_pack_cap_list_nil(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_cap_list_next& data) const; + bool unpack_cap_list_next(vm::CellSlice& cs, Ref& head, Ref& tail) const; + bool cell_unpack(Ref cell_ref, Record_cap_list_next& data) const; + bool cell_unpack_cap_list_next(Ref cell_ref, Ref& head, Ref& tail) const; + bool pack(vm::CellBuilder& cb, const Record_cap_list_next& data) const; + bool pack_cap_list_next(vm::CellBuilder& cb, Ref head, Ref tail) const; + bool cell_pack(Ref& cell_ref, const Record_cap_list_next& data) const; + bool cell_pack_cap_list_next(Ref& cell_ref, Ref head, Ref tail) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "SmcCapList"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return (int)cs.prefetch_ulong(1); + } +}; + +extern const SmcCapList t_SmcCapList; + +// +// headers for type `SmcCapability` +// + +struct SmcCapability final : TLB_Complex { + enum { cap_is_wallet, cap_method_seqno, cap_method_pubkey, cap_name }; + static constexpr char cons_len[4] = { 16, 16, 16, 8 }; + static constexpr unsigned short cons_tag[4] = { 0x2177, 0x5371, 0x71f4, 0xff }; + struct Record_cap_method_seqno { + typedef SmcCapability type_class; + }; + struct Record_cap_method_pubkey { + typedef SmcCapability type_class; + }; + struct Record_cap_is_wallet { + typedef SmcCapability type_class; + }; + struct Record_cap_name { + typedef SmcCapability type_class; + Ref name; // name : Text + Record_cap_name() = default; + Record_cap_name(Ref _name) : name(std::move(_name)) {} + }; + bool skip(vm::CellSlice& cs) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; + bool unpack(vm::CellSlice& cs, Record_cap_method_seqno& data) const; + bool unpack_cap_method_seqno(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_cap_method_seqno& data) const; + bool cell_unpack_cap_method_seqno(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_cap_method_seqno& data) const; + bool pack_cap_method_seqno(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_cap_method_seqno& data) const; + bool cell_pack_cap_method_seqno(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_cap_method_pubkey& data) const; + bool unpack_cap_method_pubkey(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_cap_method_pubkey& data) const; + bool cell_unpack_cap_method_pubkey(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_cap_method_pubkey& data) const; + bool pack_cap_method_pubkey(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_cap_method_pubkey& data) const; + bool cell_pack_cap_method_pubkey(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_cap_is_wallet& data) const; + bool unpack_cap_is_wallet(vm::CellSlice& cs) const; + bool cell_unpack(Ref cell_ref, Record_cap_is_wallet& data) const; + bool cell_unpack_cap_is_wallet(Ref cell_ref) const; + bool pack(vm::CellBuilder& cb, const Record_cap_is_wallet& data) const; + bool pack_cap_is_wallet(vm::CellBuilder& cb) const; + bool cell_pack(Ref& cell_ref, const Record_cap_is_wallet& data) const; + bool cell_pack_cap_is_wallet(Ref& cell_ref) const; + bool unpack(vm::CellSlice& cs, Record_cap_name& data) const; + bool unpack_cap_name(vm::CellSlice& cs, Ref& name) const; + bool cell_unpack(Ref cell_ref, Record_cap_name& data) const; + bool cell_unpack_cap_name(Ref cell_ref, Ref& name) const; + bool pack(vm::CellBuilder& cb, const Record_cap_name& data) const; + bool pack_cap_name(vm::CellBuilder& cb, Ref name) const; + bool cell_pack(Ref& cell_ref, const Record_cap_name& data) const; + bool cell_pack_cap_name(Ref& cell_ref, Ref name) const; + bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const override; + std::ostream& print_type(std::ostream& os) const override { + return os << "SmcCapability"; + } + int check_tag(const vm::CellSlice& cs) const override; + int get_tag(const vm::CellSlice& cs) const override { + return cs.bselect(3, 0x8e); + } +}; + +extern const SmcCapability t_SmcCapability; + // declarations of constant types used // ## 1 @@ -7367,6 +8638,8 @@ extern const NatWidth t_natwidth_8; extern const MessageRelaxed t_MessageRelaxed_Any; // ^(MessageRelaxed Any) extern const RefT t_Ref_MessageRelaxed_Any; +// ## 7 +extern const NatWidth t_natwidth_7; // #<= 60 extern const NatLeq t_natleq_60; // ^OutMsgQueueInfo @@ -7378,7 +8651,7 @@ extern const HashmapE t_HashmapE_256_LibDescr; // Maybe BlkMasterInfo extern const Maybe t_Maybe_BlkMasterInfo; // ^[$_ overload_history:uint64 underload_history:uint64 total_balance:CurrencyCollection total_validator_fees:CurrencyCollection libraries:(HashmapE 256 LibDescr) master_ref:(Maybe BlkMasterInfo) ] -extern const RefT t_Ref_TYPE_1637; +extern const RefT t_Ref_TYPE_1638; // ^McStateExtra extern const RefT t_Ref_McStateExtra; // Maybe ^McStateExtra @@ -7416,9 +8689,9 @@ extern const RefT t_Ref_McBlockExtra; // Maybe ^McBlockExtra extern const Maybe t_Maybe_Ref_McBlockExtra; // ^[$_ from_prev_blk:CurrencyCollection to_next_blk:CurrencyCollection imported:CurrencyCollection exported:CurrencyCollection ] -extern const RefT t_Ref_TYPE_1647; -// ^[$_ fees_imported:CurrencyCollection recovered:CurrencyCollection created:CurrencyCollection minted:CurrencyCollection ] extern const RefT t_Ref_TYPE_1648; +// ^[$_ fees_imported:CurrencyCollection recovered:CurrencyCollection created:CurrencyCollection minted:CurrencyCollection ] +extern const RefT t_Ref_TYPE_1649; // ## 3 extern const NatWidth t_natwidth_3; // BinTree ShardDescr @@ -7437,12 +8710,14 @@ extern const RefT t_Ref_Hashmap_32_Ref_Cell; extern const HashmapAugE t_HashmapAugE_32_KeyExtBlkRef_KeyMaxLt; // HashmapE 256 CreatorStats extern const HashmapE t_HashmapE_256_CreatorStats; +// HashmapAugE 256 CreatorStats uint32 +extern const HashmapAugE t_HashmapAugE_256_CreatorStats_uint32; // ## 16 extern const NatWidth t_natwidth_16; // Maybe ExtBlkRef extern const Maybe t_Maybe_ExtBlkRef; // ^[$_ flags:(## 16) {<= flags 1} validator_info:ValidatorInfo prev_blocks:OldMcBlocksInfo after_key_block:Bool last_key_block:(Maybe ExtBlkRef) block_create_stats:flags.0?BlockCreateStats ] -extern const RefT t_Ref_TYPE_1665; +extern const RefT t_Ref_TYPE_1666; // ^SignedCertificate extern const RefT t_Ref_SignedCertificate; // HashmapE 16 CryptoSignaturePair @@ -7450,7 +8725,7 @@ extern const HashmapE t_HashmapE_16_CryptoSignaturePair; // Maybe ^InMsg extern const Maybe t_Maybe_Ref_InMsg; // ^[$_ prev_blk_signatures:(HashmapE 16 CryptoSignaturePair) recover_create_msg:(Maybe ^InMsg) mint_msg:(Maybe ^InMsg) ] -extern const RefT t_Ref_TYPE_1673; +extern const RefT t_Ref_TYPE_1674; // Hashmap 16 ValidatorDescr extern const Hashmap t_Hashmap_16_ValidatorDescr; // HashmapE 16 ValidatorDescr @@ -7481,6 +8756,45 @@ extern const Maybe t_Maybe_Ref_BlockSignatures; extern const RefT t_Ref_TopBlockDescr; // HashmapE 96 ^TopBlockDescr extern const HashmapE t_HashmapE_96_Ref_TopBlockDescr; +// int64 +extern const Int t_int64; +// int257 +extern const Int t_int257; +// ## 10 +extern const NatWidth t_natwidth_10; +// #<= 4 +extern const NatLeq t_natleq_4; +// ^VmStackValue +extern const RefT t_Ref_VmStackValue; +// ## 24 +extern const NatWidth t_natwidth_24; +// HashmapE 4 VmStackValue +extern const HashmapE t_HashmapE_4_VmStackValue; +// ^[$_ max_limit:int64 cur_limit:int64 credit:int64 ] +extern const RefT t_Ref_TYPE_1705; +// HashmapE 256 ^Cell +extern const HashmapE t_HashmapE_256_Ref_Cell; +// uint13 +extern const UInt t_uint13; +// Maybe uint13 +extern const Maybe t_Maybe_uint13; +// Maybe VmStack +extern const Maybe t_Maybe_VmStack; +// int16 +extern const Int t_int16; +// Maybe int16 +extern const Maybe t_Maybe_int16; +// ^VmCont +extern const RefT t_Ref_VmCont; +// uint63 +extern const UInt t_uint63; +// ^DNSRecord +extern const RefT t_Ref_DNSRecord; +// HashmapE 16 ^DNSRecord +extern const HashmapE t_HashmapE_16_Ref_DNSRecord; + +// declaration of type name registration function +extern bool register_simple_types(std::function func); } // namespace gen diff --git a/submodules/ton/tonlib-src/crypto/block/block-parse.cpp b/submodules/ton/tonlib-src/crypto/block/block-parse.cpp index c410e2cb53..a032236608 100644 --- a/submodules/ton/tonlib-src/crypto/block/block-parse.cpp +++ b/submodules/ton/tonlib-src/crypto/block/block-parse.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/bits.h" #include "block/block-parse.h" @@ -80,7 +80,7 @@ bool Maybe_Anycast::skip_get_depth(vm::CellSlice& cs, int& depth) const { const Maybe_Anycast t_Maybe_Anycast; -bool MsgAddressInt::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgAddressInt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { if (!cs.have(3)) { return false; } @@ -241,16 +241,38 @@ bool MsgAddressInt::extract_std_address(vm::CellSlice& cs, ton::WorkchainId& wor return false; } +bool MsgAddressInt::store_std_address(vm::CellBuilder& cb, ton::WorkchainId workchain, + const ton::StdSmcAddress& addr) const { + if (workchain >= -128 && workchain < 128) { + return cb.store_long_bool(4, 3) // addr_std$10 anycast:(Maybe Anycast) + && cb.store_long_bool(workchain, 8) // workchain_id:int8 + && cb.store_bits_bool(addr); // address:bits256 = MsgAddressInt; + } else { + return cb.store_long_bool(0xd00, 12) // addr_var$11 anycast:(Maybe Anycast) addr_len:(## 9) + && cb.store_long_bool(workchain, 32) // workchain_id:int32 + && cb.store_bits_bool(addr); // address:(bits addr_len) = MsgAddressInt; + } +} + +Ref MsgAddressInt::pack_std_address(ton::WorkchainId workchain, const ton::StdSmcAddress& addr) const { + vm::CellBuilder cb; + if (store_std_address(cb, workchain, addr)) { + return vm::load_cell_slice_ref(cb.finalize()); + } else { + return {}; + } +} + const MsgAddressInt t_MsgAddressInt; -bool MsgAddress::validate_skip(vm::CellSlice& cs, bool weak) const { +bool MsgAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case addr_none: case addr_ext: - return t_MsgAddressExt.validate_skip(cs, weak); + return t_MsgAddressExt.validate_skip(ops, cs, weak); case addr_std: case addr_var: - return t_MsgAddressInt.validate_skip(cs, weak); + return t_MsgAddressInt.validate_skip(ops, cs, weak); } return false; } @@ -262,7 +284,7 @@ bool VarUInteger::skip(vm::CellSlice& cs) const { return len >= 0 && len < n && cs.advance(len * 8); } -bool VarUInteger::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarUInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len = (int)cs.fetch_ulong(ln); return len >= 0 && len < n && (!len || cs.prefetch_ulong(8)) && cs.advance(len * 8); } @@ -303,7 +325,7 @@ bool VarUIntegerPos::skip(vm::CellSlice& cs) const { return len > 0 && len < n && cs.advance(len * 8); } -bool VarUIntegerPos::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarUIntegerPos::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len = (int)cs.fetch_ulong(ln); return len > 0 && len < n && cs.prefetch_ulong(8) && cs.advance(len * 8); } @@ -338,7 +360,7 @@ bool VarInteger::skip(vm::CellSlice& cs) const { return len >= 0 && len < n && cs.advance(len * 8); } -bool VarInteger::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarInteger::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len = (int)cs.fetch_ulong(ln); return len >= 0 && len < n && (!len || !redundant_int(cs)) && cs.advance(len * 8); } @@ -364,7 +386,7 @@ bool VarIntegerNz::skip(vm::CellSlice& cs) const { return len > 0 && len < n && cs.advance(len * 8); } -bool VarIntegerNz::validate_skip(vm::CellSlice& cs, bool weak) const { +bool VarIntegerNz::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int len = (int)cs.fetch_ulong(ln); return len > 0 && len < n && !redundant_int(cs) && cs.advance(len * 8); } @@ -387,8 +409,8 @@ bool VarIntegerNz::store_integer_value(vm::CellBuilder& cb, const td::BigInt256& cb.store_int256_bool(value, (k + 7) & -8, true); } -bool Grams::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_16.validate_skip(cs, weak); +bool Grams::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_16.validate_skip(ops, cs, weak); } td::RefInt256 Grams::as_integer_skip(vm::CellSlice& cs) const { @@ -442,15 +464,15 @@ bool HashmapNode::skip(vm::CellSlice& cs) const { return n ? cs.advance_refs(2) : value_type.skip(cs); } -bool HashmapNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { assert(n >= 0); if (!n) { // hmn_leaf - return value_type.validate_skip(cs, weak); + return value_type.validate_skip(ops, cs, weak); } else { // hmn_fork Hashmap branch_type{n - 1, value_type}; - return branch_type.validate_ref(cs.fetch_ref(), weak) && branch_type.validate_ref(cs.fetch_ref(), weak); + return branch_type.validate_ref(ops, cs.fetch_ref(), weak) && branch_type.validate_ref(ops, cs.fetch_ref(), weak); } } @@ -459,9 +481,9 @@ bool Hashmap::skip(vm::CellSlice& cs) const { return HmLabel{n}.skip(cs, l) && HashmapNode{n - l, value_type}.skip(cs); } -bool Hashmap::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Hashmap::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int l; - return HmLabel{n}.validate_skip(cs, weak, l) && HashmapNode{n - l, value_type}.validate_skip(cs, weak); + return HmLabel{n}.validate_skip(cs, weak, l) && HashmapNode{n - l, value_type}.validate_skip(ops, cs, weak); } int HashmapE::get_size(const vm::CellSlice& cs) const { @@ -469,9 +491,9 @@ int HashmapE::get_size(const vm::CellSlice& cs) const { return (tag >= 0 ? (tag > 0 ? 0x10001 : 1) : -1); } -bool HashmapE::validate(const vm::CellSlice& cs, bool weak) const { +bool HashmapE::validate(int* ops, const vm::CellSlice& cs, bool weak) const { int tag = get_tag(cs); - return tag <= 0 ? !tag : root_type.validate_ref(cs.prefetch_ref(), weak); + return tag <= 0 ? !tag : root_type.validate_ref(ops, cs.prefetch_ref(), weak); } bool HashmapE::add_values(vm::CellBuilder& cb, vm::CellSlice& cs1, vm::CellSlice& cs2) const { @@ -561,8 +583,8 @@ bool HashmapE::store_ref(vm::CellBuilder& cb, Ref arg) const { const ExtraCurrencyCollection t_ExtraCurrencyCollection; -bool CurrencyCollection::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Grams.validate_skip(cs, weak) && t_ExtraCurrencyCollection.validate_skip(cs, weak); +bool CurrencyCollection::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Grams.validate_skip(ops, cs, weak) && t_ExtraCurrencyCollection.validate_skip(ops, cs, weak); } bool CurrencyCollection::skip(vm::CellSlice& cs) const { @@ -619,25 +641,25 @@ bool CurrencyCollection::pack(vm::CellBuilder& cb, const block::CurrencyCollecti const CurrencyCollection t_CurrencyCollection; -bool CommonMsgInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool CommonMsgInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int tag = get_tag(cs); switch (tag) { case int_msg_info: - return cs.advance(4) // int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool - && t_MsgAddressInt.validate_skip(cs, weak) // src - && t_MsgAddressInt.validate_skip(cs, weak) // dest - && t_CurrencyCollection.validate_skip(cs, weak) // value - && t_Grams.validate_skip(cs, weak) // ihr_fee - && t_Grams.validate_skip(cs, weak) // fwd_fee - && cs.advance(64 + 32); // created_lt:uint64 created_at:uint32 + return cs.advance(4) // int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool + && t_MsgAddressInt.validate_skip(ops, cs, weak) // src + && t_MsgAddressInt.validate_skip(ops, cs, weak) // dest + && t_CurrencyCollection.validate_skip(ops, cs, weak) // value + && t_Grams.validate_skip(ops, cs, weak) // ihr_fee + && t_Grams.validate_skip(ops, cs, weak) // fwd_fee + && cs.advance(64 + 32); // created_lt:uint64 created_at:uint32 case ext_in_msg_info: - return cs.advance(2) && t_MsgAddressExt.validate_skip(cs, weak) // src - && t_MsgAddressInt.validate_skip(cs, weak) // dest - && t_Grams.validate_skip(cs, weak); // import_fee + return cs.advance(2) && t_MsgAddressExt.validate_skip(ops, cs, weak) // src + && t_MsgAddressInt.validate_skip(ops, cs, weak) // dest + && t_Grams.validate_skip(ops, cs, weak); // import_fee case ext_out_msg_info: - return cs.advance(2) && t_MsgAddressInt.validate_skip(cs, weak) // src - && t_MsgAddressExt.validate_skip(cs, weak) // dest - && cs.advance(64 + 32); // created_lt:uint64 created_at:uint32 + return cs.advance(2) && t_MsgAddressInt.validate_skip(ops, cs, weak) // src + && t_MsgAddressExt.validate_skip(ops, cs, weak) // dest + && cs.advance(64 + 32); // created_lt:uint64 created_at:uint32 } return false; } @@ -699,28 +721,29 @@ const CommonMsgInfo t_CommonMsgInfo; const TickTock t_TickTock; const RefAnything t_RefCell; -bool StateInit::validate_skip(vm::CellSlice& cs, bool weak) const { - return Maybe{5}.validate_skip(cs, weak) // split_depth:(Maybe (## 5)) - && Maybe{}.validate_skip(cs, weak) // special:(Maybe TickTock) - && Maybe{}.validate_skip(cs, weak) // code:(Maybe ^Cell) - && Maybe{}.validate_skip(cs, weak) // data:(Maybe ^Cell) - && Maybe{}.validate_skip(cs, weak); // library:(Maybe ^Cell) +bool StateInit::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return Maybe{5}.validate_skip(ops, cs, weak) // split_depth:(Maybe (## 5)) + && Maybe{}.validate_skip(ops, cs, weak) // special:(Maybe TickTock) + && Maybe{}.validate_skip(ops, cs, weak) // code:(Maybe ^Cell) + && Maybe{}.validate_skip(ops, cs, weak) // data:(Maybe ^Cell) + && Maybe{}.validate_skip(ops, cs, weak); // library:(Maybe ^Cell) } bool StateInit::get_ticktock(vm::CellSlice& cs, int& ticktock) const { bool have_tt; ticktock = 0; - return Maybe{5}.validate_skip(cs) && cs.fetch_bool_to(have_tt) && (!have_tt || cs.fetch_uint_to(2, ticktock)); + return Maybe{5}.validate_skip_upto(1, cs) && cs.fetch_bool_to(have_tt) && + (!have_tt || cs.fetch_uint_to(2, ticktock)); } const StateInit t_StateInit; -bool Message::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Message::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { static const Maybe>> init_type; static const Either body_type; - return t_CommonMsgInfo.validate_skip(cs, weak) // info:CommonMsgInfo - && init_type.validate_skip(cs, weak) // init:(Maybe (Either StateInit ^StateInit)) - && body_type.validate_skip(cs, weak); // body:(Either X ^X) + return t_CommonMsgInfo.validate_skip(ops, cs, weak) // info:CommonMsgInfo + && init_type.validate_skip(ops, cs, weak) // init:(Maybe (Either StateInit ^StateInit)) + && body_type.validate_skip(ops, cs, weak); // body:(Either X ^X) } bool Message::extract_info(vm::CellSlice& cs) const { @@ -738,7 +761,7 @@ bool Message::is_internal(Ref ref) const { const Message t_Message; const RefTo t_Ref_Message; -bool IntermediateAddress::validate_skip(vm::CellSlice& cs, bool weak) const { +bool IntermediateAddress::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case interm_addr_regular: return cs.advance(1) && cs.fetch_ulong(7) <= 96U; @@ -773,12 +796,12 @@ int IntermediateAddress::get_size(const vm::CellSlice& cs) const { const IntermediateAddress t_IntermediateAddress; -bool MsgEnvelope::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.fetch_ulong(4) == 4 // msg_envelope#4 - && t_IntermediateAddress.validate_skip(cs, weak) // cur_addr:IntermediateAddress - && t_IntermediateAddress.validate_skip(cs, weak) // next_addr:IntermediateAddress - && t_Grams.validate_skip(cs, weak) // fwd_fee_remaining:Grams - && t_Ref_Message.validate_skip(cs, weak); // msg:^Message +bool MsgEnvelope::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.fetch_ulong(4) == 4 // msg_envelope#4 + && t_IntermediateAddress.validate_skip(ops, cs, weak) // cur_addr:IntermediateAddress + && t_IntermediateAddress.validate_skip(ops, cs, weak) // next_addr:IntermediateAddress + && t_Grams.validate_skip(ops, cs, weak) // fwd_fee_remaining:Grams + && t_Ref_Message.validate_skip(ops, cs, weak); // msg:^Message } bool MsgEnvelope::skip(vm::CellSlice& cs) const { @@ -827,10 +850,10 @@ bool MsgEnvelope::get_created_lt(const vm::CellSlice& cs, unsigned long long& cr const MsgEnvelope t_MsgEnvelope; const RefTo t_Ref_MsgEnvelope; -bool StorageUsed::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_7.validate_skip(cs, weak) // cells:(VarUInteger 7) - && t_VarUInteger_7.validate_skip(cs, weak) // bits:(VarUInteger 7) - && t_VarUInteger_7.validate_skip(cs, weak); // public_cells:(VarUInteger 7) +bool StorageUsed::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_7.validate_skip(ops, cs, weak) // cells:(VarUInteger 7) + && t_VarUInteger_7.validate_skip(ops, cs, weak) // bits:(VarUInteger 7) + && t_VarUInteger_7.validate_skip(ops, cs, weak); // public_cells:(VarUInteger 7) } bool StorageUsed::skip(vm::CellSlice& cs) const { @@ -841,9 +864,9 @@ bool StorageUsed::skip(vm::CellSlice& cs) const { const StorageUsed t_StorageUsed; -bool StorageUsedShort::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_7.validate_skip(cs, weak) // cells:(VarUInteger 7) - && t_VarUInteger_7.validate_skip(cs, weak); // bits:(VarUInteger 7) +bool StorageUsedShort::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_7.validate_skip(ops, cs, weak) // cells:(VarUInteger 7) + && t_VarUInteger_7.validate_skip(ops, cs, weak); // bits:(VarUInteger 7) } bool StorageUsedShort::skip(vm::CellSlice& cs) const { @@ -861,22 +884,22 @@ bool StorageInfo::skip(vm::CellSlice& cs) const { && t_Maybe_Grams.skip(cs); // due_payment:(Maybe Grams) } -bool StorageInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_StorageUsed.validate_skip(cs, weak) // used:StorageUsed - && cs.advance(32) // last_paid:uint32 - && t_Maybe_Grams.validate_skip(cs, weak); // due_payment:(Maybe Grams) +bool StorageInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_StorageUsed.validate_skip(ops, cs, weak) // used:StorageUsed + && cs.advance(32) // last_paid:uint32 + && t_Maybe_Grams.validate_skip(ops, cs, weak); // due_payment:(Maybe Grams) } const StorageInfo t_StorageInfo; -bool AccountState::validate_skip(vm::CellSlice& cs, bool weak) const { +bool AccountState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case account_uninit: return cs.advance(2); case account_frozen: return cs.advance(2 + 256); case account_active: - return cs.advance(1) && t_StateInit.validate_skip(cs, weak); + return cs.advance(1) && t_StateInit.validate_skip(ops, cs, weak); } return false; } @@ -899,8 +922,9 @@ bool AccountStorage::skip_copy_balance(vm::CellBuilder& cb, vm::CellSlice& cs) c return cs.advance(64) && t_CurrencyCollection.skip_copy(cb, cs) && t_AccountState.skip(cs); } -bool AccountStorage::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.advance(64) && t_CurrencyCollection.validate_skip(cs, weak) && t_AccountState.validate_skip(cs, weak); +bool AccountStorage::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.advance(64) && t_CurrencyCollection.validate_skip(ops, cs, weak) && + t_AccountState.validate_skip(ops, cs, weak); } const AccountStorage t_AccountStorage; @@ -918,15 +942,15 @@ bool Account::skip(vm::CellSlice& cs) const { return false; } -bool Account::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Account::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case account_none: return allow_empty && cs.advance(1); case account: - return cs.advance(1) // account$1 - && t_MsgAddressInt.validate_skip(cs, weak) // addr:MsgAddressInt - && t_StorageInfo.validate_skip(cs, weak) // storage_stat:StorageInfo - && t_AccountStorage.validate_skip(cs, weak); // storage:AccountStorage + return cs.advance(1) // account$1 + && t_MsgAddressInt.validate_skip(ops, cs, weak) // addr:MsgAddressInt + && t_StorageInfo.validate_skip(ops, cs, weak) // storage_stat:StorageInfo + && t_AccountStorage.validate_skip(ops, cs, weak); // storage:AccountStorage } return false; } @@ -1010,19 +1034,19 @@ bool HashmapAugNode::skip(vm::CellSlice& cs) const { } } -bool HashmapAugNode::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapAugNode::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { if (n < 0) { return false; } if (!n) { // ahmn_leaf vm::CellSlice cs_extra{cs}; - if (!aug.extra_type.validate_skip(cs, weak)) { + if (!aug.extra_type.validate_skip(ops, cs, weak)) { return false; } cs_extra.cut_tail(cs); vm::CellSlice cs_value{cs}; - if (!aug.value_type.validate_skip(cs, weak)) { + if (!aug.value_type.validate_skip(ops, cs, weak)) { return false; } cs_value.cut_tail(cs); @@ -1033,13 +1057,14 @@ bool HashmapAugNode::validate_skip(vm::CellSlice& cs, bool weak) const { return false; } HashmapAug branch_type{n - 1, aug}; - if (!branch_type.validate_ref(cs.prefetch_ref(0), weak) || !branch_type.validate_ref(cs.prefetch_ref(1), weak)) { + if (!branch_type.validate_ref(ops, cs.prefetch_ref(0), weak) || + !branch_type.validate_ref(ops, cs.prefetch_ref(1), weak)) { return false; } auto cs_left = load_cell_slice(cs.fetch_ref()); auto cs_right = load_cell_slice(cs.fetch_ref()); vm::CellSlice cs_extra{cs}; - if (!aug.extra_type.validate_skip(cs, weak)) { + if (!aug.extra_type.validate_skip(ops, cs, weak)) { return false; } cs_extra.cut_tail(cs); @@ -1052,9 +1077,9 @@ bool HashmapAug::skip(vm::CellSlice& cs) const { return HmLabel{n}.skip(cs, l) && HashmapAugNode{n - l, aug}.skip(cs); } -bool HashmapAug::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapAug::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int l; - return HmLabel{n}.validate_skip(cs, weak, l) && HashmapAugNode{n - l, aug}.validate_skip(cs, weak); + return HmLabel{n}.validate_skip(cs, weak, l) && HashmapAugNode{n - l, aug}.validate_skip(ops, cs, weak); } bool HashmapAug::extract_extra(vm::CellSlice& cs) const { @@ -1062,20 +1087,20 @@ bool HashmapAug::extract_extra(vm::CellSlice& cs) const { return HmLabel{n}.skip(cs, l) && (l == n || cs.advance_refs(2)) && aug.extra_type.extract(cs); } -bool HashmapAugE::validate_skip(vm::CellSlice& cs, bool weak) const { +bool HashmapAugE::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { Ref extra; switch (get_tag(cs)) { case ahme_empty: - return cs.advance(1) && (extra = root_type.aug.extra_type.validate_fetch(cs, weak)).not_null() && + return cs.advance(1) && (extra = root_type.aug.extra_type.validate_fetch(ops, cs, weak)).not_null() && root_type.aug.check_empty(extra.unique_write()); case ahme_root: - if (cs.advance(1) && root_type.validate_ref(cs.prefetch_ref(), weak)) { + if (cs.advance(1) && root_type.validate_ref(ops, cs.prefetch_ref(), weak)) { bool special; auto cs_root = load_cell_slice_special(cs.fetch_ref(), special); if (special) { return weak; } - return (extra = root_type.aug.extra_type.validate_fetch(cs, weak)).not_null() && + return (extra = root_type.aug.extra_type.validate_fetch(ops, cs, weak)).not_null() && root_type.extract_extra(cs_root) && extra->contents_equal(cs_root); } break; @@ -1099,9 +1124,10 @@ bool DepthBalanceInfo::skip(vm::CellSlice& cs) const { cs); // depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection = DepthBalanceInfo; } -bool DepthBalanceInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.fetch_ulong(5) <= 30 && t_CurrencyCollection.validate_skip( - cs, weak); // depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection +bool DepthBalanceInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.fetch_ulong(5) <= 30 && + t_CurrencyCollection.validate_skip(ops, cs, + weak); // depth_balance$_ split_depth:(#<= 30) balance:CurrencyCollection } bool DepthBalanceInfo::null_value(vm::CellBuilder& cb) const { @@ -1137,10 +1163,10 @@ bool TrStoragePhase::skip(vm::CellSlice& cs) const { && t_AccStatusChange.skip(cs); // status_change:AccStatusChange } -bool TrStoragePhase::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Grams.validate_skip(cs, weak) // storage_fees_collected:Grams - && t_Maybe_Grams.validate_skip(cs, weak) // storage_fees_due:Grams - && t_AccStatusChange.validate_skip(cs, weak); // status_change:AccStatusChange +bool TrStoragePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Grams.validate_skip(ops, cs, weak) // storage_fees_collected:Grams + && t_Maybe_Grams.validate_skip(ops, cs, weak) // storage_fees_due:Grams + && t_AccStatusChange.validate_skip(ops, cs, weak); // status_change:AccStatusChange } bool TrStoragePhase::get_storage_fees(vm::CellSlice& cs, td::RefInt256& storage_fees) const { @@ -1164,9 +1190,9 @@ bool TrCreditPhase::skip(vm::CellSlice& cs) const { && t_CurrencyCollection.skip(cs); // credit:CurrencyCollection } -bool TrCreditPhase::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Maybe_Grams.validate_skip(cs, weak) // due_fees_collected:(Maybe Grams) - && t_CurrencyCollection.validate_skip(cs, weak); // credit:CurrencyCollection +bool TrCreditPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Maybe_Grams.validate_skip(ops, cs, weak) // due_fees_collected:(Maybe Grams) + && t_CurrencyCollection.validate_skip(ops, cs, weak); // credit:CurrencyCollection } const TrCreditPhase t_TrCreditPhase; @@ -1182,15 +1208,15 @@ bool TrComputeInternal1::skip(vm::CellSlice& cs) const { // vm_final_state_hash:uint256 } -bool TrComputeInternal1::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_VarUInteger_7.validate_skip(cs, weak) // gas_used:(VarUInteger 7) - && t_VarUInteger_7.validate_skip(cs, weak) // gas_limit:(VarUInteger 7) - && Maybe{3}.validate_skip(cs, weak) // gas_credit:(Maybe (VarUInteger 3)) - && cs.advance(8 + 32) // mode:int8 exit_code:int32 - && Maybe{32}.validate_skip(cs, weak) // exit_arg:(Maybe int32) - && cs.advance(32 + 256 + 256); // vm_steps:uint32 - // vm_init_state_hash:uint256 - // vm_final_state_hash:uint256 +bool TrComputeInternal1::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_VarUInteger_7.validate_skip(ops, cs, weak) // gas_used:(VarUInteger 7) + && t_VarUInteger_7.validate_skip(ops, cs, weak) // gas_limit:(VarUInteger 7) + && Maybe{3}.validate_skip(ops, cs, weak) // gas_credit:(Maybe (VarUInteger 3)) + && cs.advance(8 + 32) // mode:int8 exit_code:int32 + && Maybe{32}.validate_skip(ops, cs, weak) // exit_arg:(Maybe int32) + && cs.advance(32 + 256 + 256); // vm_steps:uint32 + // vm_init_state_hash:uint256 + // vm_final_state_hash:uint256 } const TrComputeInternal1 t_TrComputeInternal1; @@ -1209,14 +1235,14 @@ bool TrComputePhase::skip(vm::CellSlice& cs) const { return false; } -bool TrComputePhase::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TrComputePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case tr_phase_compute_skipped: - return cs.advance(1) && t_ComputeSkipReason.validate_skip(cs, weak); + return cs.advance(1) && t_ComputeSkipReason.validate_skip(ops, cs, weak); case tr_phase_compute_vm: return cs.advance(1 + 3) // tr_phase_compute_vm$1 success:Bool msg_state_used:Bool account_activated:Bool - && t_Grams.validate_skip(cs, weak) // gas_fees:Grams - && t_Ref_TrComputeInternal1.validate_skip(cs, weak); // ^[ gas_used:(..) .. ] + && t_Grams.validate_skip(ops, cs, weak) // gas_fees:Grams + && t_Ref_TrComputeInternal1.validate_skip(ops, cs, weak); // ^[ gas_used:(..) .. ] } return false; } @@ -1236,17 +1262,17 @@ bool TrActionPhase::skip(vm::CellSlice& cs) const { && t_StorageUsedShort.skip(cs); // tot_msg_size:StorageUsedShort } -bool TrActionPhase::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.advance(3) // success:Bool valid:Bool no_funds:Bool - && t_AccStatusChange.validate_skip(cs, weak) // status_change:AccStatusChange - && t_Maybe_Grams.validate_skip(cs, weak) // total_fwd_fees:(Maybe Grams) - && t_Maybe_Grams.validate_skip(cs, weak) // total_action_fees:(Maybe Grams) - && cs.advance(32) // result_code:int32 - && Maybe{32}.validate_skip(cs, weak) // result_arg:(Maybe int32) - && cs.advance(16 * 4 + 256) // tot_actions:uint16 spec_actions:uint16 - // skipped_actions:uint16 msgs_created:uint16 - // action_list_hash:uint256 - && t_StorageUsedShort.validate_skip(cs, weak); // tot_msg_size:StorageUsed +bool TrActionPhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.advance(3) // success:Bool valid:Bool no_funds:Bool + && t_AccStatusChange.validate_skip(ops, cs, weak) // status_change:AccStatusChange + && t_Maybe_Grams.validate_skip(ops, cs, weak) // total_fwd_fees:(Maybe Grams) + && t_Maybe_Grams.validate_skip(ops, cs, weak) // total_action_fees:(Maybe Grams) + && cs.advance(32) // result_code:int32 + && Maybe{32}.validate_skip(ops, cs, weak) // result_arg:(Maybe int32) + && cs.advance(16 * 4 + 256) // tot_actions:uint16 spec_actions:uint16 + // skipped_actions:uint16 msgs_created:uint16 + // action_list_hash:uint256 + && t_StorageUsedShort.validate_skip(ops, cs, weak); // tot_msg_size:StorageUsed } const TrActionPhase t_TrActionPhase; @@ -1268,19 +1294,19 @@ bool TrBouncePhase::skip(vm::CellSlice& cs) const { return false; } -bool TrBouncePhase::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TrBouncePhase::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case tr_phase_bounce_negfunds: return cs.advance(2); // tr_phase_bounce_negfunds$00 case tr_phase_bounce_nofunds: - return cs.advance(2) // tr_phase_bounce_nofunds$01 - && t_StorageUsedShort.validate_skip(cs, weak) // msg_size:StorageUsedShort - && t_Grams.validate_skip(cs, weak); // req_fwd_fees:Grams + return cs.advance(2) // tr_phase_bounce_nofunds$01 + && t_StorageUsedShort.validate_skip(ops, cs, weak) // msg_size:StorageUsedShort + && t_Grams.validate_skip(ops, cs, weak); // req_fwd_fees:Grams case tr_phase_bounce_ok: - return cs.advance(1) // tr_phase_bounce_ok$1 - && t_StorageUsedShort.validate_skip(cs, weak) // msg_size:StorageUsedShort - && t_Grams.validate_skip(cs, weak) // msg_fees:Grams - && t_Grams.validate_skip(cs, weak); // fwd_fees:Grams + return cs.advance(1) // tr_phase_bounce_ok$1 + && t_StorageUsedShort.validate_skip(ops, cs, weak) // msg_size:StorageUsedShort + && t_Grams.validate_skip(ops, cs, weak) // msg_fees:Grams + && t_Grams.validate_skip(ops, cs, weak); // fwd_fees:Grams } return false; } @@ -1300,7 +1326,7 @@ bool SplitMergeInfo::skip(vm::CellSlice& cs) const { return cs.advance(6 + 6 + 256 + 256); } -bool SplitMergeInfo::validate_skip(vm::CellSlice& cs, bool weak) const { +bool SplitMergeInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { if (!cs.have(6 + 6 + 256 + 256)) { return false; } @@ -1370,52 +1396,52 @@ bool TransactionDescr::skip(vm::CellSlice& cs) const { return false; } -bool TransactionDescr::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TransactionDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case trans_ord: - return cs.advance(4 + 1) // trans_ord$0000 credit_first:Bool - && Maybe{}.validate_skip(cs, weak) // storage_ph:(Maybe TrStoragePhase) - && Maybe{}.validate_skip(cs, weak) // credit_ph:(Maybe TrCreditPhase) - && t_TrComputePhase.validate_skip(cs, weak) // compute_ph:TrComputePhase - && Maybe>{}.validate_skip(cs, weak) // action:(Maybe ^TrActionPhase) - && cs.advance(1) // aborted:Bool - && Maybe{}.validate_skip(cs, weak) // bounce:(Maybe TrBouncePhase) - && cs.advance(1); // destroyed:Bool + return cs.advance(4 + 1) // trans_ord$0000 credit_first:Bool + && Maybe{}.validate_skip(ops, cs, weak) // storage_ph:(Maybe TrStoragePhase) + && Maybe{}.validate_skip(ops, cs, weak) // credit_ph:(Maybe TrCreditPhase) + && t_TrComputePhase.validate_skip(ops, cs, weak) // compute_ph:TrComputePhase + && Maybe>{}.validate_skip(ops, cs, weak) // action:(Maybe ^TrActionPhase) + && cs.advance(1) // aborted:Bool + && Maybe{}.validate_skip(ops, cs, weak) // bounce:(Maybe TrBouncePhase) + && cs.advance(1); // destroyed:Bool case trans_storage: - return cs.advance(4) // trans_storage$0001 - && t_TrStoragePhase.validate_skip(cs, weak); // storage_ph:TrStoragePhase + return cs.advance(4) // trans_storage$0001 + && t_TrStoragePhase.validate_skip(ops, cs, weak); // storage_ph:TrStoragePhase case trans_tick_tock: - return cs.advance(4) // trans_tick_tock$001 is_tock:Bool - && t_TrStoragePhase.validate_skip(cs, weak) // storage_ph:TrStoragePhase - && t_TrComputePhase.validate_skip(cs, weak) // compute_ph:TrComputePhase - && Maybe>{}.validate_skip(cs, weak) // action:(Maybe ^TrActionPhase) - && cs.advance(2); // aborted:Bool destroyed:Bool + return cs.advance(4) // trans_tick_tock$001 is_tock:Bool + && t_TrStoragePhase.validate_skip(ops, cs, weak) // storage_ph:TrStoragePhase + && t_TrComputePhase.validate_skip(ops, cs, weak) // compute_ph:TrComputePhase + && Maybe>{}.validate_skip(ops, cs, weak) // action:(Maybe ^TrActionPhase) + && cs.advance(2); // aborted:Bool destroyed:Bool case trans_split_prepare: - return cs.advance(4) // trans_split_prepare$0100 - && t_SplitMergeInfo.validate_skip(cs, weak) // split_info:SplitMergeInfo - && Maybe{}.validate_skip(cs, weak) // storage_ph:(Maybe TrStoragePhase) - && t_TrComputePhase.validate_skip(cs, weak) // compute_ph:TrComputePhase - && Maybe>{}.validate_skip(cs, weak) // action:(Maybe ^TrActionPhase) - && cs.advance(2); // aborted:Bool destroyed:Bool + return cs.advance(4) // trans_split_prepare$0100 + && t_SplitMergeInfo.validate_skip(ops, cs, weak) // split_info:SplitMergeInfo + && Maybe{}.validate_skip(ops, cs, weak) // storage_ph:(Maybe TrStoragePhase) + && t_TrComputePhase.validate_skip(ops, cs, weak) // compute_ph:TrComputePhase + && Maybe>{}.validate_skip(ops, cs, weak) // action:(Maybe ^TrActionPhase) + && cs.advance(2); // aborted:Bool destroyed:Bool case trans_split_install: - return cs.advance(4) // trans_split_install$0101 - && t_SplitMergeInfo.validate_skip(cs, weak) // split_info:SplitMergeInfo - && t_Ref_Transaction.validate_skip(cs, weak) // prepare_transaction:^Transaction - && cs.advance(1); // installed:Bool + return cs.advance(4) // trans_split_install$0101 + && t_SplitMergeInfo.validate_skip(ops, cs, weak) // split_info:SplitMergeInfo + && t_Ref_Transaction.validate_skip(ops, cs, weak) // prepare_transaction:^Transaction + && cs.advance(1); // installed:Bool case trans_merge_prepare: - return cs.advance(4) // trans_merge_prepare$0110 - && t_SplitMergeInfo.validate_skip(cs, weak) // split_info:SplitMergeInfo - && t_TrStoragePhase.validate_skip(cs, weak) // storage_ph:TrStoragePhase - && cs.advance(1); // aborted:Bool + return cs.advance(4) // trans_merge_prepare$0110 + && t_SplitMergeInfo.validate_skip(ops, cs, weak) // split_info:SplitMergeInfo + && t_TrStoragePhase.validate_skip(ops, cs, weak) // storage_ph:TrStoragePhase + && cs.advance(1); // aborted:Bool case trans_merge_install: - return cs.advance(4) // trans_merge_install$0111 - && t_SplitMergeInfo.validate_skip(cs, weak) // split_info:SplitMergeInfo - && t_Ref_Transaction.validate_skip(cs, weak) // prepare_transaction:^Transaction - && Maybe{}.validate_skip(cs, weak) // storage_ph:(Maybe TrStoragePhase) - && Maybe{}.validate_skip(cs, weak) // credit_ph:(Maybe TrCreditPhase) - && Maybe{}.validate_skip(cs, weak) // compute_ph:TrComputePhase - && Maybe>{}.validate_skip(cs, weak) // action:(Maybe ^TrActionPhase) - && cs.advance(2); // aborted:Bool destroyed:Bool + return cs.advance(4) // trans_merge_install$0111 + && t_SplitMergeInfo.validate_skip(ops, cs, weak) // split_info:SplitMergeInfo + && t_Ref_Transaction.validate_skip(ops, cs, weak) // prepare_transaction:^Transaction + && Maybe{}.validate_skip(ops, cs, weak) // storage_ph:(Maybe TrStoragePhase) + && Maybe{}.validate_skip(ops, cs, weak) // credit_ph:(Maybe TrCreditPhase) + && Maybe{}.validate_skip(ops, cs, weak) // compute_ph:TrComputePhase + && Maybe>{}.validate_skip(ops, cs, weak) // action:(Maybe ^TrActionPhase) + && cs.advance(2); // aborted:Bool destroyed:Bool } return false; } @@ -1479,9 +1505,9 @@ bool Transaction_aux::skip(vm::CellSlice& cs) const { && HashmapE{15, t_Ref_Message}.skip(cs); // out_msgs:(HashmapE 15 ^Message) } -bool Transaction_aux::validate_skip(vm::CellSlice& cs, bool weak) const { - return Maybe>{}.validate_skip(cs, weak) // in_msg:(Maybe ^Message) - && HashmapE{15, t_Ref_Message}.validate_skip(cs, weak); // out_msgs:(HashmapE 15 ^Message) +bool Transaction_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return Maybe>{}.validate_skip(ops, cs, weak) // in_msg:(Maybe ^Message) + && HashmapE{15, t_Ref_Message}.validate_skip(ops, cs, weak); // out_msgs:(HashmapE 15 ^Message) } const Transaction_aux t_Transaction_aux; @@ -1498,18 +1524,18 @@ bool Transaction::skip(vm::CellSlice& cs) const { && RefTo{}.skip(cs); // description:^TransactionDescr } -bool Transaction::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Transaction::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 7 // transaction$0111 && cs.advance( 256 + 64 + 256 + 64 + 32 + 15) // account_addr:uint256 lt:uint64 prev_trans_hash:bits256 prev_trans_lt:uint64 now:uint32 outmsg_cnt:uint15 - && t_AccountStatus.validate_skip(cs, weak) // orig_status:AccountStatus - && t_AccountStatus.validate_skip(cs, weak) // end_status:AccountStatus - && RefTo{}.validate_skip(cs, weak) // ^[ in_msg:... out_msgs:... ] - && t_CurrencyCollection.validate_skip(cs, weak) // total_fees:CurrencyCollection - && t_Ref_HashUpdate.validate_skip(cs, weak) // state_update:^(HASH_UPDATE Account) - && RefTo{}.validate_skip(cs, weak); // description:^TransactionDescr + && t_AccountStatus.validate_skip(ops, cs, weak) // orig_status:AccountStatus + && t_AccountStatus.validate_skip(ops, cs, weak) // end_status:AccountStatus + && RefTo{}.validate_skip(ops, cs, weak) // ^[ in_msg:... out_msgs:... ] + && t_CurrencyCollection.validate_skip(ops, cs, weak) // total_fees:CurrencyCollection + && t_Ref_HashUpdate.validate_skip(ops, cs, weak) // state_update:^(HASH_UPDATE Account) + && RefTo{}.validate_skip(ops, cs, weak); // description:^TransactionDescr } bool Transaction::get_storage_fees(Ref cell, td::RefInt256& storage_fees) const { @@ -1573,12 +1599,12 @@ bool AccountBlock::skip(vm::CellSlice& cs) const { && cs.advance_refs(1); // state_update:^(HASH_UPDATE Account) } -bool AccountBlock::validate_skip(vm::CellSlice& cs, bool weak) const { +bool AccountBlock::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { return cs.fetch_ulong(4) == 5 // acc_trans#5 && cs.advance(256) // account_addr:bits256 - && - t_AccountTransactions.validate_skip(cs, weak) // transactions:(HashmapAug 64 ^Transaction CurrencyCollection) - && t_Ref_HashUpdate.validate_skip(cs, weak); // state_update:^(HASH_UPDATE Account) + && t_AccountTransactions.validate_skip(ops, cs, + weak) // transactions:(HashmapAug 64 ^Transaction CurrencyCollection) + && t_Ref_HashUpdate.validate_skip(ops, cs, weak); // state_update:^(HASH_UPDATE Account) } bool AccountBlock::get_total_fees(vm::CellSlice&& cs, block::CurrencyCollection& total_fees) const { @@ -1598,8 +1624,8 @@ const Aug_ShardAccountBlocks aug_ShardAccountBlocks; const HashmapAugE t_ShardAccountBlocks{256, aug_ShardAccountBlocks}; // (HashmapAugE 256 AccountBlock CurrencyCollection) -bool ImportFees::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_Grams.validate_skip(cs, weak) && t_CurrencyCollection.validate_skip(cs, weak); +bool ImportFees::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_Grams.validate_skip(ops, cs, weak) && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ImportFees::skip(vm::CellSlice& cs) const { @@ -1654,44 +1680,44 @@ bool InMsg::skip(vm::CellSlice& cs) const { return false; } -bool InMsg::validate_skip(vm::CellSlice& cs, bool weak) const { +bool InMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case msg_import_ext: - return cs.advance(3) // msg_import_ext$000 - && t_Ref_Message.validate_skip(cs, weak) // msg:^Message - && t_Ref_Transaction.validate_skip(cs, weak); // transaction:^Transaction + return cs.advance(3) // msg_import_ext$000 + && t_Ref_Message.validate_skip(ops, cs, weak) // msg:^Message + && t_Ref_Transaction.validate_skip(ops, cs, weak); // transaction:^Transaction case msg_import_ihr: - return cs.advance(3) // msg_import_ihr$010 - && t_Ref_Message.validate_skip(cs, weak) // msg:^Message - && t_Ref_Transaction.validate_skip(cs, weak) // transaction:^Transaction - && t_Grams.validate_skip(cs, weak) // ihr_fee:Grams - && t_RefCell.validate_skip(cs, weak); // proof_created:^Cell + return cs.advance(3) // msg_import_ihr$010 + && t_Ref_Message.validate_skip(ops, cs, weak) // msg:^Message + && t_Ref_Transaction.validate_skip(ops, cs, weak) // transaction:^Transaction + && t_Grams.validate_skip(ops, cs, weak) // ihr_fee:Grams + && t_RefCell.validate_skip(ops, cs, weak); // proof_created:^Cell case msg_import_imm: - return cs.advance(3) // msg_import_imm$011 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // in_msg:^MsgEnvelope - && t_Ref_Transaction.validate_skip(cs, weak) // transaction:^Transaction - && t_Grams.validate_skip(cs, weak); // fwd_fee:Grams + return cs.advance(3) // msg_import_imm$011 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // in_msg:^MsgEnvelope + && t_Ref_Transaction.validate_skip(ops, cs, weak) // transaction:^Transaction + && t_Grams.validate_skip(ops, cs, weak); // fwd_fee:Grams case msg_import_fin: - return cs.advance(3) // msg_import_fin$100 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // in_msg:^MsgEnvelope - && t_Ref_Transaction.validate_skip(cs, weak) // transaction:^Transaction - && t_Grams.validate_skip(cs, weak); // fwd_fee:Grams + return cs.advance(3) // msg_import_fin$100 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // in_msg:^MsgEnvelope + && t_Ref_Transaction.validate_skip(ops, cs, weak) // transaction:^Transaction + && t_Grams.validate_skip(ops, cs, weak); // fwd_fee:Grams case msg_import_tr: - return cs.advance(3) // msg_import_tr$101 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // in_msg:^MsgEnvelope - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && t_Grams.validate_skip(cs, weak); // transit_fee:Grams + return cs.advance(3) // msg_import_tr$101 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // in_msg:^MsgEnvelope + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && t_Grams.validate_skip(ops, cs, weak); // transit_fee:Grams case msg_discard_fin: - return cs.advance(3) // msg_discard_fin$110 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // in_msg:^MsgEnvelope - && cs.advance(64) // transaction_id:uint64 - && t_Grams.validate_skip(cs, weak); // fwd_fee:Grams + return cs.advance(3) // msg_discard_fin$110 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // in_msg:^MsgEnvelope + && cs.advance(64) // transaction_id:uint64 + && t_Grams.validate_skip(ops, cs, weak); // fwd_fee:Grams case msg_discard_tr: - return cs.advance(3) // msg_discard_tr$111 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // in_msg:^MsgEnvelope - && cs.advance(64) // transaction_id:uint64 - && t_Grams.validate_skip(cs, weak) // fwd_fee:Grams - && t_RefCell.validate_skip(cs, weak); // proof_delivered:^Cell + return cs.advance(3) // msg_discard_tr$111 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // in_msg:^MsgEnvelope + && cs.advance(64) // transaction_id:uint64 + && t_Grams.validate_skip(ops, cs, weak) // fwd_fee:Grams + && t_RefCell.validate_skip(ops, cs, weak); // proof_delivered:^Cell } return false; } @@ -1829,37 +1855,37 @@ bool OutMsg::skip(vm::CellSlice& cs) const { return false; } -bool OutMsg::validate_skip(vm::CellSlice& cs, bool weak) const { +bool OutMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { switch (get_tag(cs)) { case msg_export_ext: - return cs.advance(3) // msg_export_ext$000 - && t_Ref_Message.validate_skip(cs, weak) // msg:^Message - && t_Ref_Transaction.validate_skip(cs, weak); // transaction:^Transaction + return cs.advance(3) // msg_export_ext$000 + && t_Ref_Message.validate_skip(ops, cs, weak) // msg:^Message + && t_Ref_Transaction.validate_skip(ops, cs, weak); // transaction:^Transaction case msg_export_imm: - return cs.advance(3) // msg_export_imm$010 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && t_Ref_Transaction.validate_skip(cs, weak) // transaction:^Transaction - && RefTo{}.validate_skip(cs, weak); // reimport:^InMsg + return cs.advance(3) // msg_export_imm$010 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && t_Ref_Transaction.validate_skip(ops, cs, weak) // transaction:^Transaction + && RefTo{}.validate_skip(ops, cs, weak); // reimport:^InMsg case msg_export_new: - return cs.advance(3) // msg_export_new$001 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && t_Ref_Transaction.validate_skip(cs, weak); // transaction:^Transaction + return cs.advance(3) // msg_export_new$001 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && t_Ref_Transaction.validate_skip(ops, cs, weak); // transaction:^Transaction case msg_export_tr: - return cs.advance(3) // msg_export_tr$011 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && RefTo{}.validate_skip(cs, weak); // imported:^InMsg + return cs.advance(3) // msg_export_tr$011 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && RefTo{}.validate_skip(ops, cs, weak); // imported:^InMsg case msg_export_deq_imm: - return cs.advance(3) // msg_export_deq_imm$100 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && RefTo{}.validate_skip(cs, weak); // reimport:^InMsg + return cs.advance(3) // msg_export_deq_imm$100 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && RefTo{}.validate_skip(ops, cs, weak); // reimport:^InMsg case msg_export_deq: - return cs.advance(3) // msg_export_deq$110 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && cs.advance(64); // import_block_lt:uint64 + return cs.advance(3) // msg_export_deq$110 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && cs.advance(64); // import_block_lt:uint64 case msg_export_tr_req: - return cs.advance(3) // msg_export_tr_req$111 - && t_Ref_MsgEnvelope.validate_skip(cs, weak) // out_msg:^MsgEnvelope - && RefTo{}.validate_skip(cs, weak); // imported:^InMsg + return cs.advance(3) // msg_export_tr_req$111 + && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak) // out_msg:^MsgEnvelope + && RefTo{}.validate_skip(ops, cs, weak); // imported:^InMsg } return false; } @@ -1932,8 +1958,8 @@ const OutMsg t_OutMsg; const Aug_OutMsgDescr aug_OutMsgDescr; const OutMsgDescr t_OutMsgDescr; -bool EnqueuedMsg::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.advance(64) && t_Ref_MsgEnvelope.validate_skip(cs, weak); +bool EnqueuedMsg::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.advance(64) && t_Ref_MsgEnvelope.validate_skip(ops, cs, weak); } const EnqueuedMsg t_EnqueuedMsg; @@ -1967,9 +1993,9 @@ bool OutMsgQueueInfo::skip(vm::CellSlice& cs) const { return t_OutMsgQueue.skip(cs) && t_ProcessedInfo.skip(cs) && t_IhrPendingInfo.skip(cs); } -bool OutMsgQueueInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_OutMsgQueue.validate_skip(cs, weak) && t_ProcessedInfo.validate_skip(cs, weak) && - t_IhrPendingInfo.validate_skip(cs, weak); +bool OutMsgQueueInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_OutMsgQueue.validate_skip(ops, cs, weak) && t_ProcessedInfo.validate_skip(ops, cs, weak) && + t_IhrPendingInfo.validate_skip(ops, cs, weak); } const OutMsgQueueInfo t_OutMsgQueueInfo; @@ -2005,10 +2031,27 @@ bool ExtBlkRef::unpack(Ref cs_ref, ton::BlockIdExt& blkid, ton::L return true; } +bool ExtBlkRef::store(vm::CellBuilder& cb, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const { + return cb.store_long_bool(end_lt, 64) // ext_blk_ref$_ end_lt:uint64 + && cb.store_long_bool(blkid.seqno(), 32) // seq_no:uint32 + && cb.store_bits_bool(blkid.root_hash) // root_hash:bits256 + && cb.store_bits_bool(blkid.file_hash); // file_hash:bits256 = ExtBlkRef; +} + +Ref ExtBlkRef::pack_cell(const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const { + vm::CellBuilder cb; + return store(cb, blkid, end_lt) ? cb.finalize() : Ref{}; +} + +bool ExtBlkRef::pack_to(Ref& cell, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const { + vm::CellBuilder cb; + return store(cb, blkid, end_lt) && cb.finalize_to(cell); +} + const ExtBlkRef t_ExtBlkRef; const BlkMasterInfo t_BlkMasterInfo; -bool ShardIdent::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardIdent::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int shard_pfx_len, workchain_id; unsigned long long shard_pfx; if (cs.fetch_ulong(2) == 0 && cs.fetch_uint_to(6, shard_pfx_len) && cs.fetch_int_to(32, workchain_id) && @@ -2073,8 +2116,8 @@ bool ShardIdent::pack(vm::CellBuilder& cb, ton::ShardIdFull data) const { const ShardIdent t_ShardIdent; -bool BlockIdExt::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_ShardIdent.validate_skip(cs, weak) && cs.advance(32 + 256 * 2); +bool BlockIdExt::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_ShardIdent.validate_skip(ops, cs, weak) && cs.advance(32 + 256 * 2); } bool BlockIdExt::unpack(vm::CellSlice& cs, ton::BlockIdExt& data) const { @@ -2107,21 +2150,21 @@ bool ShardState::skip(vm::CellSlice& cs) const { && Maybe>{}.skip(cs); // custom:(Maybe ^McStateExtra) } -bool ShardState::validate_skip(vm::CellSlice& cs, bool weak) const { +bool ShardState::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int seq_no; return get_tag(cs) == shard_state && cs.advance(64) // shard_state#9023afe2 blockchain_id:int32 - && t_ShardIdent.validate_skip(cs, weak) // shard_id:ShardIdent + && t_ShardIdent.validate_skip(ops, cs, weak) // shard_id:ShardIdent && cs.fetch_int_to(32, seq_no) // seq_no:int32 && seq_no >= -1 // { seq_no >= -1 } && cs.advance(32 + 32 + 64 + 32) // vert_seq_no:# gen_utime:uint32 gen_lt:uint64 min_ref_mc_seqno:uint32 - && t_Ref_OutMsgQueueInfo.validate_skip(cs, weak) // out_msg_queue_info:^OutMsgQueueInfo - && cs.advance(1) // before_split:Bool - && t_ShardAccounts.validate_skip_ref(cs, weak) // accounts:^ShardAccounts + && t_Ref_OutMsgQueueInfo.validate_skip(ops, cs, weak) // out_msg_queue_info:^OutMsgQueueInfo + && cs.advance(1) // before_split:Bool + && t_ShardAccounts.validate_skip_ref(ops, cs, weak) // accounts:^ShardAccounts && t_ShardState_aux.validate_skip_ref( - cs, + ops, cs, weak) // ^[ total_balance:CurrencyCollection total_validator_fees:CurrencyCollection libraries:(HashmapE 256 LibDescr) master_ref:(Maybe BlkMasterInfo) ] - && Maybe>{}.validate_skip(cs, weak); // custom:(Maybe ^McStateExtra) + && Maybe>{}.validate_skip(ops, cs, weak); // custom:(Maybe ^McStateExtra) } const ShardState t_ShardState; @@ -2134,12 +2177,12 @@ bool ShardState_aux::skip(vm::CellSlice& cs) const { && Maybe{}.skip(cs); // master_ref:(Maybe BlkMasterInfo) } -bool ShardState_aux::validate_skip(vm::CellSlice& cs, bool weak) const { - return cs.advance(128) // overload_history:uint64 underload_history:uint64 - && t_CurrencyCollection.validate_skip(cs, weak) // total_balance:CurrencyCollection - && t_CurrencyCollection.validate_skip(cs, weak) // total_validator_fees:CurrencyCollection - && HashmapE{256, t_LibDescr}.validate_skip(cs, weak) // libraries:(HashmapE 256 LibDescr) - && Maybe{}.validate_skip(cs, weak); // master_ref:(Maybe BlkMasterInfo) +bool ShardState_aux::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return cs.advance(128) // overload_history:uint64 underload_history:uint64 + && t_CurrencyCollection.validate_skip(ops, cs, weak) // total_balance:CurrencyCollection + && t_CurrencyCollection.validate_skip(ops, cs, weak) // total_validator_fees:CurrencyCollection + && HashmapE{256, t_LibDescr}.validate_skip(ops, cs, weak) // libraries:(HashmapE 256 LibDescr) + && Maybe{}.validate_skip(ops, cs, weak); // master_ref:(Maybe BlkMasterInfo) } const ShardState_aux t_ShardState_aux; @@ -2150,10 +2193,10 @@ bool LibDescr::skip(vm::CellSlice& cs) const { && Hashmap{256, t_True}.skip(cs); // publishers:(Hashmap 256 False) } -bool LibDescr::validate_skip(vm::CellSlice& cs, bool weak) const { - return get_tag(cs) == shared_lib_descr && cs.advance(2) // shared_lib_descr$00 - && cs.fetch_ref().not_null() // lib:^Cell - && Hashmap{256, t_True}.validate_skip(cs, weak); // publishers:(Hashmap 256 False) +bool LibDescr::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return get_tag(cs) == shared_lib_descr && cs.advance(2) // shared_lib_descr$00 + && cs.fetch_ref().not_null() // lib:^Cell + && Hashmap{256, t_True}.validate_skip(ops, cs, weak); // publishers:(Hashmap 256 False) } const LibDescr t_LibDescr; @@ -2163,9 +2206,9 @@ bool BlkPrevInfo::skip(vm::CellSlice& cs) const { && (!merged || t_ExtBlkRef.skip(cs)); // prev_alt:merged?ExtBlkRef } -bool BlkPrevInfo::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_ExtBlkRef.validate_skip(cs, weak) // prev_blk_info$_ {merged:#} prev:ExtBlkRef - && (!merged || t_ExtBlkRef.validate_skip(cs, weak)); // prev_alt:merged?ExtBlkRef +bool BlkPrevInfo::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_ExtBlkRef.validate_skip(ops, cs, weak) // prev_blk_info$_ {merged:#} prev:ExtBlkRef + && (!merged || t_ExtBlkRef.validate_skip(ops, cs, weak)); // prev_alt:merged?ExtBlkRef } const BlkPrevInfo t_BlkPrevInfo_0{0}; @@ -2174,8 +2217,8 @@ bool McStateExtra::skip(vm::CellSlice& cs) const { return block::gen::t_McStateExtra.skip(cs); } -bool McStateExtra::validate_skip(vm::CellSlice& cs, bool weak) const { - return block::gen::t_McStateExtra.validate_skip(cs, weak); // ?? +bool McStateExtra::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return block::gen::t_McStateExtra.validate_skip(ops, cs, weak); // ?? } const McStateExtra t_McStateExtra; @@ -2202,8 +2245,8 @@ bool ShardFeeCreated::skip(vm::CellSlice& cs) const { return t_CurrencyCollection.skip(cs) && t_CurrencyCollection.skip(cs); } -bool ShardFeeCreated::validate_skip(vm::CellSlice& cs, bool weak) const { - return t_CurrencyCollection.validate_skip(cs, weak) && t_CurrencyCollection.validate_skip(cs, weak); +bool ShardFeeCreated::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { + return t_CurrencyCollection.validate_skip(ops, cs, weak) && t_CurrencyCollection.validate_skip(ops, cs, weak); } bool ShardFeeCreated::null_value(vm::CellBuilder& cb) const { diff --git a/submodules/ton/tonlib-src/crypto/block/block-parse.h b/submodules/ton/tonlib-src/crypto/block/block-parse.h index acbe9dd426..9590631132 100644 --- a/submodules/ton/tonlib-src/crypto/block/block-parse.h +++ b/submodules/ton/tonlib-src/crypto/block/block-parse.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "common/refcnt.hpp" @@ -59,7 +59,7 @@ struct VarUInteger final : TLB_Complex { ln = 32 - td::count_leading_zeroes32(n - 1); } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override; unsigned long long as_uint(const vm::CellSlice& cs) const override; bool null_value(vm::CellBuilder& cb) const override { @@ -78,7 +78,7 @@ struct VarUIntegerPos final : TLB_Complex { ln = 32 - td::count_leading_zeroes32(n - 1); } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override; unsigned long long as_uint(const vm::CellSlice& cs) const override; bool store_integer_value(vm::CellBuilder& cb, const td::BigInt256& value) const override; @@ -92,7 +92,7 @@ struct VarInteger final : TLB_Complex { ln = 32 - td::count_leading_zeroes32(n - 1); } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override; long long as_int(const vm::CellSlice& cs) const override; bool null_value(vm::CellBuilder& cb) const override { @@ -107,7 +107,7 @@ struct VarIntegerNz final : TLB_Complex { ln = 32 - td::count_leading_zeroes32(n - 1); } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override; long long as_int(const vm::CellSlice& cs) const override; bool store_integer_value(vm::CellBuilder& cb, const td::BigInt256& value) const override; @@ -123,13 +123,13 @@ struct Unary final : TLB { bool skip(vm::CellSlice& cs, int& n) const { return validate_skip(cs, false, n); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return cs.advance(get_size(cs)); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return skip(cs); } bool skip(vm::CellSlice& cs) const override { - return validate_skip(cs); + return cs.advance(get_size(cs)); } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { return cs.have(get_size(cs)); } }; @@ -149,7 +149,7 @@ struct HmLabel final : TLB_Complex { int n; return skip(cs, n); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { int n; return validate_skip(cs, weak, n); } @@ -162,7 +162,7 @@ struct Hashmap final : TLB_Complex { Hashmap(int _n, const TLB& _val_type) : value_type(_val_type), n(_n) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; struct HashmapNode final : TLB_Complex { @@ -173,7 +173,7 @@ struct HashmapNode final : TLB_Complex { } int get_size(const vm::CellSlice& cs) const override; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return n > 0 ? hmn_fork : n; } @@ -185,7 +185,7 @@ struct HashmapE final : TLB { HashmapE(int _n, const TLB& _val_type) : root_type(_n, _val_type) { } int get_size(const vm::CellSlice& cs) const override; - bool validate(const vm::CellSlice& cs, bool weak = false) const override; + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(1); } @@ -221,7 +221,7 @@ struct HashmapAug final : TLB_Complex { HashmapAug(int _n, const AugmentationCheckData& _aug) : aug(_aug), n(_n) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool extract_extra(vm::CellSlice& cs) const; }; @@ -232,7 +232,7 @@ struct HashmapAugNode final : TLB_Complex { HashmapAugNode(int _n, const AugmentationCheckData& _aug) : aug(_aug), n(_n) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return n > 0 ? ahmn_fork : n; } @@ -244,7 +244,7 @@ struct HashmapAugE final : TLB_Complex { HashmapAugE(int _n, const AugmentationCheckData& _aug) : root_type(_n, std::move(_aug)) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool extract_extra(vm::CellSlice& cs) const; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(1); @@ -252,7 +252,7 @@ struct HashmapAugE final : TLB_Complex { }; struct Grams final : TLB_Complex { - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override; bool null_value(vm::CellBuilder& cb) const override; bool store_integer_value(vm::CellBuilder& cb, const td::BigInt256& value) const override; @@ -264,7 +264,7 @@ extern const Grams t_Grams; struct MsgAddressInt final : TLB_Complex { enum { addr_std = 2, addr_var = 3 }; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(2); } @@ -285,6 +285,8 @@ struct MsgAddressInt final : TLB_Complex { bool rewrite = true) const; bool extract_std_address(vm::CellSlice& cs, ton::WorkchainId& workchain, ton::StdSmcAddress& addr, bool rewrite = true) const; + bool store_std_address(vm::CellBuilder& cb, ton::WorkchainId workchain, const ton::StdSmcAddress& addr) const; + Ref pack_std_address(ton::WorkchainId workchain, const ton::StdSmcAddress& addr) const; }; extern const MsgAddressInt t_MsgAddressInt; @@ -301,7 +303,7 @@ extern const MsgAddressExt t_MsgAddressExt; struct MsgAddress final : TLB_Complex { enum { addr_none = 0, addr_ext = 1, addr_std = 2, addr_var = 3 }; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(2); } @@ -316,8 +318,8 @@ struct ExtraCurrencyCollection final : TLB { int get_size(const vm::CellSlice& cs) const override { return dict_type.get_size(cs); } - bool validate(const vm::CellSlice& cs, bool weak) const override { - return dict_type.validate(cs, weak); + bool validate(int* ops, const vm::CellSlice& cs, bool weak) const override { + return dict_type.validate(ops, cs, weak); } bool null_value(vm::CellBuilder& cb) const override { return cb.store_zeroes_bool(1); @@ -346,7 +348,7 @@ extern const ExtraCurrencyCollection t_ExtraCurrencyCollection; struct CurrencyCollection final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; td::RefInt256 as_integer_skip(vm::CellSlice& cs) const override; bool null_value(vm::CellBuilder& cb) const override { return cb.store_bits_same_bool(1 + 4, false); @@ -369,7 +371,7 @@ extern const CurrencyCollection t_CurrencyCollection; struct CommonMsgInfo final : TLB_Complex { enum { int_msg_info = 0, ext_in_msg_info = 2, ext_out_msg_info = 3 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { int v = (int)cs.prefetch_ulong(2); return v == 1 ? int_msg_info : v; @@ -400,14 +402,14 @@ struct TickTock final : TLB { extern const TickTock t_TickTock; struct StateInit final : TLB_Complex { - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool get_ticktock(vm::CellSlice& cs, int& ticktock) const; }; extern const StateInit t_StateInit; struct Message final : TLB_Complex { - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool extract_info(vm::CellSlice& cs) const; bool get_created_lt(vm::CellSlice& cs, unsigned long long& created_lt) const; bool is_internal(const vm::CellSlice& cs) const { @@ -423,7 +425,7 @@ struct IntermediateAddress final : TLB_Complex { enum { interm_addr_regular = 0, interm_addr_simple = 2, interm_addr_ext = 3 }; int get_size(const vm::CellSlice& cs) const override; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool fetch_regular(vm::CellSlice& cs, int& use_dst_bits) const { return cs.fetch_uint_to(8, use_dst_bits) && use_dst_bits <= 96; } @@ -437,7 +439,7 @@ extern const IntermediateAddress t_IntermediateAddress; struct MsgEnvelope final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool extract_fwd_fees_remaining(vm::CellSlice& cs) const; struct Record { typedef MsgEnvelope type_class; @@ -461,28 +463,28 @@ extern const RefTo t_Ref_MsgEnvelope; struct StorageUsed final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const StorageUsed t_StorageUsed; struct StorageUsedShort final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const StorageUsedShort t_StorageUsedShort; struct StorageInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const StorageInfo t_StorageInfo; struct AccountState final : TLB_Complex { enum { account_uninit = 0, account_frozen = 1, account_active = 2 }; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { int t = (int)cs.prefetch_ulong(2); return t == 3 ? account_active : t; @@ -494,7 +496,7 @@ extern const AccountState t_AccountState; struct AccountStorage final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool skip_copy_balance(vm::CellBuilder& cb, vm::CellSlice& cs) const; }; @@ -506,7 +508,7 @@ struct Account final : TLB_Complex { Account(bool _allow_empty = false) : allow_empty(_allow_empty) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; // Ref get_balance(const vm::CellSlice& cs) const; bool skip_copy_balance(vm::CellBuilder& cb, vm::CellSlice& cs) const; bool skip_copy_depth_balance(vm::CellBuilder& cb, vm::CellSlice& cs) const; @@ -551,8 +553,8 @@ struct ShardAccount final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x140, 1); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return cs.advance(0x140) && t_Ref_Account.validate_skip(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return cs.advance(0x140) && t_Ref_Account.validate_skip(ops, cs, weak); } static bool unpack(vm::CellSlice& cs, Record& info) { return info.unpack(cs); @@ -567,7 +569,7 @@ extern const ShardAccount t_ShardAccount; struct DepthBalanceInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool null_value(vm::CellBuilder& cb) const override; bool add_values(vm::CellBuilder& cb, vm::CellSlice& cs1, vm::CellSlice& cs2) const override; }; @@ -588,8 +590,8 @@ struct ShardAccounts final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return dict_type.skip(cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return dict_type.validate_skip(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return dict_type.validate_skip(ops, cs, weak); } }; @@ -613,7 +615,7 @@ extern const AccStatusChange t_AccStatusChange; struct TrStoragePhase final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool get_storage_fees(vm::CellSlice& cs, td::RefInt256& storage_fees) const; bool maybe_get_storage_fees(vm::CellSlice& cs, td::RefInt256& storage_fees) const; }; @@ -622,14 +624,14 @@ extern const TrStoragePhase t_TrStoragePhase; struct TrCreditPhase final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const TrCreditPhase t_TrCreditPhase; struct TrComputeInternal1 final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; struct ComputeSkipReason final : TLB { @@ -637,7 +639,7 @@ struct ComputeSkipReason final : TLB { int get_size(const vm::CellSlice& cs) const override { return 2; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return get_tag(cs) >= 0 && cs.advance(2); } int get_tag(const vm::CellSlice& cs) const override { @@ -651,7 +653,7 @@ extern const ComputeSkipReason t_ComputeSkipReason; struct TrComputePhase final : TLB_Complex { enum { tr_phase_compute_skipped = 0, tr_phase_compute_vm = 1 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(1); } @@ -661,7 +663,7 @@ extern const TrComputePhase t_TrComputePhase; struct TrActionPhase final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const TrActionPhase t_TrActionPhase; @@ -669,7 +671,7 @@ extern const TrActionPhase t_TrActionPhase; struct TrBouncePhase final : TLB_Complex { enum { tr_phase_bounce_negfunds = 0, tr_phase_bounce_nofunds = 1, tr_phase_bounce_ok = 2 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override; }; @@ -677,7 +679,7 @@ extern const TrBouncePhase t_TrBouncePhase; struct SplitMergeInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const SplitMergeInfo t_SplitMergeInfo; @@ -693,7 +695,7 @@ struct TransactionDescr final : TLB_Complex { trans_merge_install = 7 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override; bool skip_to_storage_phase(vm::CellSlice& cs, bool& found) const; bool get_storage_fees(Ref cell, td::RefInt256& storage_fees) const; @@ -703,14 +705,14 @@ extern const TransactionDescr t_TransactionDescr; struct Transaction_aux final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const Transaction_aux t_Transaction_aux; struct Transaction final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool get_total_fees(vm::CellSlice&& cs, block::CurrencyCollection& total_fees) const; bool get_descr(Ref cell, Ref& tdescr) const; bool get_descr(vm::CellSlice& cs, Ref& tdescr) const; @@ -733,7 +735,7 @@ struct HashUpdate final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(8 + 256 * 2); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return cs.fetch_ulong(8) == 0x72 && cs.advance(256 * 2); } }; @@ -743,7 +745,7 @@ extern const RefTo t_Ref_HashUpdate; struct AccountBlock final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool get_total_fees(vm::CellSlice&& cs, block::CurrencyCollection& total_fees) const; }; @@ -760,7 +762,7 @@ extern const HashmapAugE t_ShardAccountBlocks; // (HashmapAugE 256 AccountBlock struct ImportFees final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool null_value(vm::CellBuilder& cb) const override { return cb.store_bits_same_bool(4 + 4 + 1, false); } @@ -780,7 +782,7 @@ struct InMsg final : TLB_Complex { msg_discard_tr = 7 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(3); } @@ -800,7 +802,7 @@ struct OutMsg final : TLB_Complex { msg_export_tr_req = 7 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(3); } @@ -828,8 +830,8 @@ struct InMsgDescr final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return dict_type.skip(cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return dict_type.validate_skip(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return dict_type.validate_skip(ops, cs, weak); } }; @@ -851,8 +853,8 @@ struct OutMsgDescr final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return dict_type.skip(cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return dict_type.validate_skip(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return dict_type.validate_skip(ops, cs, weak); } }; @@ -865,7 +867,7 @@ struct EnqueuedMsg final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance_ext(0x10040); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, EnqueuedMsgDescr& descr) const { return descr.unpack(cs); } @@ -889,8 +891,8 @@ struct OutMsgQueue final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return dict_type.skip(cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return dict_type.validate_skip(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return dict_type.validate_skip(ops, cs, weak); } }; @@ -908,7 +910,7 @@ extern const HashmapE t_IhrPendingInfo; struct OutMsgQueueInfo final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const OutMsgQueueInfo t_OutMsgQueueInfo; @@ -921,6 +923,9 @@ struct ExtBlkRef final : TLB { } bool unpack(vm::CellSlice& cs, ton::BlockIdExt& blkid, ton::LogicalTime* end_lt = nullptr) const; bool unpack(Ref cs_ref, ton::BlockIdExt& blkid, ton::LogicalTime* end_lt = nullptr) const; + bool store(vm::CellBuilder& cb, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const; + Ref pack_cell(const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const; + bool pack_to(Ref& cell, const ton::BlockIdExt& blkid, ton::LogicalTime end_lt) const; }; extern const ExtBlkRef t_ExtBlkRef; @@ -941,7 +946,7 @@ struct ShardIdent final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(get_size(cs)); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return 0; } @@ -980,7 +985,7 @@ struct BlockIdExt final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.advance(get_size(cs)); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool unpack(vm::CellSlice& cs, ton::BlockIdExt& data) const; bool pack(vm::CellBuilder& cb, const ton::BlockIdExt& data) const; }; @@ -990,7 +995,7 @@ extern const BlockIdExt t_BlockIdExt; struct ShardState final : TLB_Complex { enum { shard_state = (int)0x9023afe2, split_state = 0x5f327da5 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(32) == shard_state ? shard_state : -1; } @@ -1000,7 +1005,7 @@ extern const ShardState t_ShardState; struct ShardState_aux final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return 0; } @@ -1011,7 +1016,7 @@ extern const ShardState_aux t_ShardState_aux; struct LibDescr final : TLB_Complex { enum { shared_lib_descr = 0 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(2); } @@ -1024,7 +1029,7 @@ struct BlkPrevInfo final : TLB_Complex { BlkPrevInfo(bool _merged) : merged(_merged) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const BlkPrevInfo t_BlkPrevInfo_0; @@ -1032,7 +1037,7 @@ extern const BlkPrevInfo t_BlkPrevInfo_0; struct McStateExtra final : TLB_Complex { enum { masterchain_state_extra = 0xcc26 }; bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; }; extern const McStateExtra t_McStateExtra; @@ -1069,7 +1074,7 @@ extern const Aug_OldMcBlocksInfo aug_OldMcBlocksInfo; struct ShardFeeCreated final : TLB_Complex { bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; bool null_value(vm::CellBuilder& cb) const override; bool add_values(vm::CellBuilder& cb, vm::CellSlice& cs1, vm::CellSlice& cs2) const override; }; diff --git a/submodules/ton/tonlib-src/crypto/block/block.cpp b/submodules/ton/tonlib-src/crypto/block/block.cpp index 80723b5856..d9d3c26726 100644 --- a/submodules/ton/tonlib-src/crypto/block/block.cpp +++ b/submodules/ton/tonlib-src/crypto/block/block.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/bits.h" #include "block/block.h" @@ -789,10 +789,11 @@ td::Status ShardState::unpack_state(ton::BlockIdExt blkid, Ref prev_st return td::Status::Error(-666, "ShardState of "s + id_.to_str() + " does not contain a valid global_balance"); } if (extra.r1.flags & 1) { - if (extra.r1.block_create_stats->prefetch_ulong(8) != 0x17) { + if (extra.r1.block_create_stats->prefetch_ulong(8) == 0x17) { + block_create_stats_ = std::make_unique(extra.r1.block_create_stats->prefetch_ref(), 256); + } else { return td::Status::Error(-666, "ShardState of "s + id_.to_str() + " does not contain a valid BlockCreateStats"); } - block_create_stats_ = std::make_unique(extra.r1.block_create_stats->prefetch_ref(), 256); } else { block_create_stats_ = std::make_unique(256); } @@ -812,11 +813,11 @@ td::Status ShardState::unpack_out_msg_queue_info(Ref out_msg_queue_inf LOG(DEBUG) << "unpacking ProcessedUpto of our previous block " << id_.to_str(); block::gen::t_ProcessedInfo.print(std::cerr, qinfo.proc_info); } - if (!block::gen::t_ProcessedInfo.validate_csr(qinfo.proc_info)) { + if (!block::gen::t_ProcessedInfo.validate_csr(1024, qinfo.proc_info)) { return td::Status::Error( -666, "ProcessedInfo in the state of "s + id_.to_str() + " is invalid according to automated validity checks"); } - if (!block::gen::t_IhrPendingInfo.validate_csr(qinfo.ihr_pending)) { + if (!block::gen::t_IhrPendingInfo.validate_csr(1024, qinfo.ihr_pending)) { return td::Status::Error( -666, "IhrPendingInfo in the state of "s + id_.to_str() + " is invalid according to automated validity checks"); } @@ -1035,7 +1036,7 @@ td::Status ShardState::split(ton::ShardIdFull subshard) { LOG(DEBUG) << "splitting total_balance"; auto old_total_balance = total_balance_; auto accounts_extra = account_dict_->get_root_extra(); - if (!(accounts_extra.write().advance(5) && total_balance_.validate_unpack(accounts_extra))) { + if (!(accounts_extra.write().advance(5) && total_balance_.validate_unpack(accounts_extra, 1024))) { LOG(ERROR) << "cannot unpack CurrencyCollection from the root of newly-split accounts dictionary"; return td::Status::Error( -666, "error splitting total balance in account dictionary of shardchain state "s + id_.to_str()); @@ -1084,16 +1085,16 @@ int filter_out_msg_queue(vm::AugmentedDictionary& out_queue, ton::ShardIdFull ol }); } -bool CurrencyCollection::validate() const { - return is_valid() && td::sgn(grams) >= 0 && validate_extra(); +bool CurrencyCollection::validate(int max_cells) const { + return is_valid() && td::sgn(grams) >= 0 && validate_extra(max_cells); } -bool CurrencyCollection::validate_extra() const { +bool CurrencyCollection::validate_extra(int max_cells) const { if (extra.is_null()) { return true; } vm::CellBuilder cb; - return cb.store_maybe_ref(extra) && block::tlb::t_ExtraCurrencyCollection.validate_ref(cb.finalize()); + return cb.store_maybe_ref(extra) && block::tlb::t_ExtraCurrencyCollection.validate_ref(max_cells, cb.finalize()); } bool CurrencyCollection::add(const CurrencyCollection& a, const CurrencyCollection& b, CurrencyCollection& c) { @@ -1264,8 +1265,8 @@ bool CurrencyCollection::unpack(Ref csr) { return unpack_CurrencyCollection(std::move(csr), grams, extra) || invalidate(); } -bool CurrencyCollection::validate_unpack(Ref csr) { - return (csr.not_null() && block::tlb::t_CurrencyCollection.validate(*csr) && +bool CurrencyCollection::validate_unpack(Ref csr, int max_cells) { + return (csr.not_null() && block::tlb::t_CurrencyCollection.validate_upto(max_cells, *csr) && unpack_CurrencyCollection(std::move(csr), grams, extra)) || invalidate(); } @@ -1592,7 +1593,7 @@ bool check_one_config_param(Ref cs_ref, td::ConstBitPtr key, td:: } else if (idx < 0) { return true; } - bool ok = block::gen::ConfigParam{idx}.validate_ref(std::move(cell)); + bool ok = block::gen::ConfigParam{idx}.validate_ref(1024, std::move(cell)); if (!ok) { LOG(ERROR) << "configuration parameter #" << idx << " is invalid"; } @@ -1745,7 +1746,7 @@ td::Status unpack_block_prev_blk_ext(Ref block_root, const ton::BlockI block::gen::ExtBlkRef::Record mcref; // _ ExtBlkRef = BlkMasterInfo; ton::ShardIdFull shard; if (!(tlb::unpack_cell(block_root, blk) && tlb::unpack_cell(blk.info, info) && !info.version && - block::tlb::t_ShardIdent.unpack(info.shard.write(), shard) && !info.vert_seq_no && + block::tlb::t_ShardIdent.unpack(info.shard.write(), shard) && (!info.not_master || tlb::unpack_cell(info.master_ref, mcref)))) { return td::Status::Error("cannot unpack block header"); } @@ -1809,6 +1810,9 @@ td::Status unpack_block_prev_blk_ext(Ref block_root, const ton::BlockI } else { mc_blkid = ton::BlockIdExt{ton::masterchainId, ton::shardIdAll, mcref.seq_no, mcref.root_hash, mcref.file_hash}; } + if (shard.is_masterchain() && info.vert_seqno_incr && !info.key_block) { + return td::Status::Error("non-key masterchain block cannot have vert_seqno_incr set"); + } return td::Status::OK(); } @@ -1817,7 +1821,7 @@ td::Status check_block_header(Ref block_root, const ton::BlockIdExt& i block::gen::BlockInfo::Record info; ton::ShardIdFull shard; if (!(tlb::unpack_cell(block_root, blk) && tlb::unpack_cell(blk.info, info) && !info.version && - block::tlb::t_ShardIdent.unpack(info.shard.write(), shard) && !info.vert_seq_no)) { + block::tlb::t_ShardIdent.unpack(info.shard.write(), shard))) { return td::Status::Error("cannot unpack block header"); } ton::BlockId hdr_id{shard, (unsigned)info.seq_no}; @@ -1843,6 +1847,18 @@ td::Status check_block_header(Ref block_root, const ton::BlockIdExt& i return td::Status::OK(); } +std::unique_ptr get_block_create_stats_dict(Ref state_root) { + block::gen::ShardStateUnsplit::Record info; + block::gen::McStateExtra::Record extra; + block::gen::BlockCreateStats::Record_block_create_stats cstats; + if (!(::tlb::unpack_cell(std::move(state_root), info) && info.custom->size_refs() && + ::tlb::unpack_cell(info.custom->prefetch_ref(), extra) && (extra.r1.flags & 1) && + ::tlb::csr_unpack(std::move(extra.r1.block_create_stats), cstats))) { + return {}; + } + return std::make_unique(std::move(cstats.counters), 256); +} + std::unique_ptr get_prev_blocks_dict(Ref state_root) { block::gen::ShardStateUnsplit::Record info; block::gen::McStateExtra::Record extra_info; diff --git a/submodules/ton/tonlib-src/crypto/block/block.h b/submodules/ton/tonlib-src/crypto/block/block.h index fd9a724f26..0d961320bd 100644 --- a/submodules/ton/tonlib-src/crypto/block/block.h +++ b/submodules/ton/tonlib-src/crypto/block/block.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "common/refcnt.hpp" @@ -163,12 +163,12 @@ struct MsgProcessedUpto { MsgProcessedUpto(ton::ShardId _shard, ton::BlockSeqno _mcseqno, ton::LogicalTime _lt, td::ConstBitPtr _hash) : shard(_shard), mc_seqno(_mcseqno), last_inmsg_lt(_lt), last_inmsg_hash(_hash) { } - bool operator<(const MsgProcessedUpto& other) const& { + bool operator<(const MsgProcessedUpto& other) const & { return shard < other.shard || (shard == other.shard && mc_seqno < other.mc_seqno); } - bool contains(const MsgProcessedUpto& other) const&; + bool contains(const MsgProcessedUpto& other) const &; bool contains(ton::ShardId other_shard, ton::LogicalTime other_lt, td::ConstBitPtr other_hash, - ton::BlockSeqno other_mc_seqno) const&; + ton::BlockSeqno other_mc_seqno) const &; // NB: this is for checking whether we have already imported an internal message bool already_processed(const EnqueuedMsgDescr& msg) const; }; @@ -323,8 +323,8 @@ struct CurrencyCollection { grams.clear(); return false; } - bool validate() const; - bool validate_extra() const; + bool validate(int max_cells = 1024) const; + bool validate_extra(int max_cells = 1024) const; bool operator==(const CurrencyCollection& other) const; bool operator!=(const CurrencyCollection& other) const { return !operator==(other); @@ -360,7 +360,7 @@ struct CurrencyCollection { bool fetch(vm::CellSlice& cs); bool fetch_exact(vm::CellSlice& cs); bool unpack(Ref csr); - bool validate_unpack(Ref csr); + bool validate_unpack(Ref csr, int max_cells = 1024); Ref pack() const; bool pack_to(Ref& csr) const { return (csr = pack()).not_null(); @@ -514,6 +514,9 @@ struct DiscountedCounter { return last_updated == other.last_updated && total == other.total && cnt2048 <= other.cnt2048 + 1 && other.cnt2048 <= cnt2048 + 1 && cnt65536 <= other.cnt65536 + 1 && other.cnt65536 <= cnt65536 + 1; } + bool modified_since(ton::UnixTime utime) const { + return last_updated >= utime; + } bool validate(); bool increase_by(unsigned count, ton::UnixTime now); bool fetch(vm::CellSlice& cs); @@ -629,6 +632,8 @@ td::Status unpack_block_prev_blk_try(Ref block_root, const ton::BlockI td::Status check_block_header(Ref block_root, const ton::BlockIdExt& id, ton::Bits256* store_shard_hash_to = nullptr); +std::unique_ptr get_block_create_stats_dict(Ref state_root); + std::unique_ptr get_prev_blocks_dict(Ref state_root); bool get_old_mc_block_id(vm::AugmentedDictionary* prev_blocks_dict, ton::BlockSeqno seqno, ton::BlockIdExt& blkid, ton::LogicalTime* end_lt = nullptr); diff --git a/submodules/ton/tonlib-src/crypto/block/block.tlb b/submodules/ton/tonlib-src/crypto/block/block.tlb index ec91ef5755..a30cd89a87 100644 --- a/submodules/ton/tonlib-src/crypto/block/block.tlb +++ b/submodules/ton/tonlib-src/crypto/block/block.tlb @@ -366,6 +366,10 @@ action_send_msg#0ec3c86d mode:(## 8) action_set_code#ad4de08e new_code:^Cell = OutAction; action_reserve_currency#36e6b809 mode:(## 8) currency:CurrencyCollection = OutAction; +libref_hash$0 lib_hash:bits256 = LibRef; +libref_ref$1 library:^Cell = LibRef; +action_change_library#26fa1dd4 mode:(## 7) { mode <= 2 } + libref:LibRef = OutAction; out_list_node$_ prev:^Cell action:OutAction = OutListNode; // @@ -505,6 +509,7 @@ _ (HashmapAugE 32 KeyExtBlkRef KeyMaxLt) = OldMcBlocksInfo; counters#_ last_updated:uint32 total:uint64 cnt2048:uint64 cnt65536:uint64 = Counters; creator_info#4 mc_blocks:Counters shard_blocks:Counters = CreatorStats; block_create_stats#17 counters:(HashmapE 256 CreatorStats) = BlockCreateStats; +block_create_stats_ext#34 counters:(HashmapAugE 256 CreatorStats uint32) = BlockCreateStats; masterchain_state_extra#cc26 shard_hashes:ShardHashes @@ -678,3 +683,77 @@ top_block_descr#d5 proof_for:BlockIdExt signatures:(Maybe ^BlockSignatures) // COLLATED DATA // top_block_descr_set#4ac789f3 collection:(HashmapE 96 ^TopBlockDescr) = TopBlockDescrSet; + +// +// TVM REFLECTION +// +vm_stk_null#00 = VmStackValue; +vm_stk_tinyint#01 value:int64 = VmStackValue; +vm_stk_int#0201_ value:int257 = VmStackValue; +vm_stk_nan#02ff = VmStackValue; +vm_stk_cell#03 cell:^Cell = VmStackValue; +_ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits } + st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice; +vm_stk_slice#04 _:VmCellSlice = VmStackValue; +vm_stk_builder#05 cell:^Cell = VmStackValue; +vm_stk_cont#06 cont:VmCont = VmStackValue; +vm_tupref_nil$_ = VmTupleRef 0; +vm_tupref_single$_ entry:^VmStackValue = VmTupleRef 1; +vm_tupref_any$_ {n:#} ref:^(VmTuple (n + 2)) = VmTupleRef (n + 2); +vm_tuple_nil$_ = VmTuple 0; +vm_tuple_tcons$_ {n:#} head:(VmTupleRef n) tail:^VmStackValue = VmTuple (n + 1); +vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue; + +vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack; +vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1); +vm_stk_nil#_ = VmStackList 0; + +_ cregs:(HashmapE 4 VmStackValue) = VmSaveList; +gas_limits#_ remaining:int64 _:^[ max_limit:int64 cur_limit:int64 credit:int64 ] + = VmGasLimits; +_ libraries:(HashmapE 256 ^Cell) = VmLibraries; + +vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList +cp:(Maybe int16) = VmControlData; +vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont; +vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont; +vmc_quit$1000 exit_code:int32 = VmCont; +vmc_quit_exc$1001 = VmCont; +vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont; +vmc_until$110000 body:^VmCont after:^VmCont = VmCont; +vmc_again$110001 body:^VmCont = VmCont; +vmc_while_cond$110010 cond:^VmCont body:^VmCont +after:^VmCont = VmCont; +vmc_while_body$110011 cond:^VmCont body:^VmCont +after:^VmCont = VmCont; +vmc_pushint$1111 value:int32 next:^VmCont = VmCont; + +// +// DNS RECORDS +// +_ (HashmapE 16 ^DNSRecord) = DNS_RecordSet; + +chunk_ref$_ {n:#} ref:^(TextChunks (n + 1)) = TextChunkRef (n + 1); +chunk_ref_empty$_ = TextChunkRef 0; +text_chunk$_ {n:#} len:(## 8) data:(bits (len * 8)) next:(TextChunkRef n) = TextChunks (n + 1); +text_chunk_empty$_ = TextChunks 0; +text$_ chunks:(## 8) rest:(TextChunks chunks) = Text; +dns_text#1eda _:Text = DNSRecord; + +dns_next_resolver#ba93 resolver:MsgAddressInt = DNSRecord; // usually in record #-1 + +dns_adnl_address#ad01 adnl_addr:bits256 flags:(## 8) { flags <= 1 } + proto_list:flags . 0?ProtoList = DNSRecord; // often in record #2 +proto_list_nil$0 = ProtoList; +proto_list_next$1 head:Protocol tail:ProtoList = ProtoList; +proto_http#4854 = Protocol; + +dns_smc_address#9fd3 smc_addr:MsgAddressInt flags:(## 8) { flags <= 1 } + cap_list:flags . 0?SmcCapList = DNSRecord; // often in record #1 +cap_list_nil$0 = SmcCapList; +cap_list_next$1 head:SmcCapability tail:SmcCapList = SmcCapList; +cap_method_seqno#5371 = SmcCapability; +cap_method_pubkey#71f4 = SmcCapability; +cap_is_wallet#2177 = SmcCapability; +cap_name#ff name:Text = SmcCapability; + diff --git a/submodules/ton/tonlib-src/crypto/block/check-proof.cpp b/submodules/ton/tonlib-src/crypto/block/check-proof.cpp index 7db7a97c6c..f8d38baac8 100644 --- a/submodules/ton/tonlib-src/crypto/block/check-proof.cpp +++ b/submodules/ton/tonlib-src/crypto/block/check-proof.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "check-proof.h" #include "block/block.h" @@ -219,7 +219,17 @@ td::Status check_account_proof(td::Slice proof, ton::BlockIdExt shard_blk, const } td::Result AccountState::validate(ton::BlockIdExt ref_blk, block::StdAddress addr) const { - TRY_RESULT_PREFIX(root, vm::std_boc_deserialize(state.as_slice(), true), "cannot deserialize account state"); + TRY_RESULT_PREFIX(true_root, vm::std_boc_deserialize(state.as_slice(), true), "cannot deserialize account state"); + Ref root; + + if (is_virtualized && true_root.not_null()) { + root = vm::MerkleProof::virtualize(true_root, 1); + if (root.is_null()) { + return td::Status::Error("account state proof is invalid"); + } + } else { + root = true_root; + } if (blk != ref_blk && ref_blk.id.seqno != ~0U) { return td::Status::Error(PSLICE() << "obtained getAccountState() for a different reference block " << blk.to_str() @@ -241,6 +251,7 @@ td::Result AccountState::validate(ton::BlockIdExt ref_blk, b TRY_STATUS(block::check_account_proof(proof.as_slice(), shard_blk, addr, root, &res.last_trans_lt, &res.last_trans_hash, &res.gen_utime, &res.gen_lt)); res.root = std::move(root); + res.true_root = std::move(true_root); return res; } diff --git a/submodules/ton/tonlib-src/crypto/block/check-proof.h b/submodules/ton/tonlib-src/crypto/block/check-proof.h index 173ae9e475..cfd3a0d2c1 100644 --- a/submodules/ton/tonlib-src/crypto/block/check-proof.h +++ b/submodules/ton/tonlib-src/crypto/block/check-proof.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -44,10 +44,11 @@ struct AccountState { td::BufferSlice shard_proof; td::BufferSlice proof; td::BufferSlice state; + bool is_virtualized{false}; struct Info { - td::Ref root; - ton::LogicalTime last_trans_lt = 0; + td::Ref root, true_root; + ton::LogicalTime last_trans_lt{0}; ton::Bits256 last_trans_hash; ton::LogicalTime gen_lt{0}; td::uint32 gen_utime{0}; diff --git a/submodules/ton/tonlib-src/crypto/block/create-state.cpp b/submodules/ton/tonlib-src/crypto/block/create-state.cpp index 8b92a24fa2..5eb14528c9 100644 --- a/submodules/ton/tonlib-src/crypto/block/create-state.cpp +++ b/submodules/ton/tonlib-src/crypto/block/create-state.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include @@ -633,6 +633,88 @@ void init_words_custom(fift::Dictionary& d) { d.def_stack_word("isWorkchainDescr? ", interpret_is_workchain_descr); } +tlb::TypenameLookup tlb_dict; + +// ( S -- T -1 or 0 ) Looks up TLB type by name +void interpret_tlb_type_lookup(vm::Stack& stack) { + auto ptr = tlb_dict.lookup(stack.pop_string()); + if (ptr) { + stack.push_make_object(ptr); + } + stack.push_bool(ptr); +} + +td::Ref pop_tlb_type(vm::Stack& stack) { + auto res = stack.pop_object(); + if (res.is_null()) { + throw vm::VmError{vm::Excno::type_chk, "not a TLB type"}; + } + return res; +} + +// ( T -- S ) Gets TLB type name +void interpret_tlb_type_name(vm::Stack& stack) { + stack.push_string((*pop_tlb_type(stack))->get_type_name()); +} + +// ( T -- ) Prints TLB type name +void interpret_print_tlb_type(vm::Stack& stack) { + std::cout << (*pop_tlb_type(stack))->get_type_name(); +} + +// ( s T -- ) Dumps (part of) slice s as a value of TLB type T +void interpret_tlb_dump_as(vm::Stack& stack) { + auto tp = pop_tlb_type(stack); + (*tp)->print(std::cout, stack.pop_cellslice()); +} + +// ( s T -- s' S -1 or 0 ) +// Detects prefix of slice s that is a value of TLB type T, returns the remainder as s', and prints the value into String S. +void interpret_tlb_dump_to_str(vm::Stack& stack) { + auto tp = pop_tlb_type(stack); + auto cs = stack.pop_cellslice(); + std::ostringstream os; + bool ok = (*tp)->print_skip(os, cs.write()); + if (ok) { + stack.push(std::move(cs)); + stack.push_string(os.str()); + } + stack.push_bool(ok); +} + +// ( s T -- s' -1 or 0 ) Skips the only prefix of slice s that can be a value of TLB type T +void interpret_tlb_skip(vm::Stack& stack) { + auto tp = pop_tlb_type(stack); + auto cs = stack.pop_cellslice(); + bool ok = (*tp)->skip(cs.write()); + if (ok) { + stack.push(std::move(cs)); + } + stack.push_bool(ok); +} + +// ( s T -- s' -1 or 0 ) Checks whether a prefix of slice s is a valid value of TLB type T, and skips it +void interpret_tlb_validate_skip(vm::Stack& stack) { + auto tp = pop_tlb_type(stack); + auto cs = stack.pop_cellslice(); + bool ok = (*tp)->validate_skip_upto(1048576, cs.write()); + if (ok) { + stack.push(std::move(cs)); + } + stack.push_bool(ok); +} + +void init_words_tlb(fift::Dictionary& d) { + tlb_dict.register_types(block::gen::register_simple_types); + d.def_stack_word("tlb-type-lookup ", interpret_tlb_type_lookup); + d.def_stack_word("tlb-type-name ", interpret_tlb_type_name); + d.def_stack_word("tlb. ", interpret_print_tlb_type); + d.def_stack_word("tlb-dump-as ", interpret_tlb_dump_as); + d.def_stack_word("(tlb-dump-str?) ", interpret_tlb_dump_to_str); + d.def_stack_word("tlb-skip ", interpret_tlb_skip); + d.def_stack_word("tlb-validate-skip ", interpret_tlb_validate_skip); +} + void usage(const char* progname) { std::cerr << "Creates initial state for a TON blockchain, using configuration defined by Fift-language source files\n"; @@ -739,6 +821,7 @@ int main(int argc, char* const argv[]) { fift::init_words_vm(config.dictionary); fift::init_words_ton(config.dictionary); init_words_custom(config.dictionary); + init_words_tlb(config.dictionary); if (script_mode) { fift::import_cmdline_args(config.dictionary, source_list.empty() ? "" : source_list[0], argc - optind, diff --git a/submodules/ton/tonlib-src/crypto/block/dump-block.cpp b/submodules/ton/tonlib-src/crypto/block/dump-block.cpp index ef4e1d8411..716aa3bc51 100644 --- a/submodules/ton/tonlib-src/crypto/block/dump-block.cpp +++ b/submodules/ton/tonlib-src/crypto/block/dump-block.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "block/block.h" #include "vm/boc.h" @@ -98,7 +98,7 @@ void test1() { block::tlb::ShardIdent::Record shard_id; for (int i = 0; i < 3; i++) { - std::cout << "ShardIdent.validate() = " << block::tlb::t_ShardIdent.validate(csl) << std::endl; + std::cout << "ShardIdent.validate() = " << block::tlb::t_ShardIdent.validate_upto(1024, csl) << std::endl; csl.print_rec(std::cerr); csl.dump(std::cerr, 7); std::cout << "ShardIdent.unpack() = " << block::tlb::t_ShardIdent.unpack(csl, shard_id) << std::endl; @@ -107,9 +107,9 @@ void test1() { << " shard_prefix:" << shard_id.shard_prefix << std::endl; } } - std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip(csl) << std::endl; - std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip(csl) << std::endl; - std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip(csl) << std::endl; + std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip_upto(1024, csl) << std::endl; + std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip_upto(1024, csl) << std::endl; + std::cout << "ShardIdent.skip_validate() = " << block::tlb::t_ShardIdent.validate_skip_upto(1024, csl) << std::endl; using namespace td::literals; std::cout << "Grams.store_intval(239) = " << block::tlb::t_Grams.store_integer_value(cb, "239"_i256) << std::endl; std::cout << "Grams.store_intval(17239) = " << block::tlb::t_Grams.store_integer_value(cb, "17239"_i256) << std::endl; @@ -120,13 +120,13 @@ void test1() { std::cout << "Grams.store_intval(666) = " << block::tlb::t_Grams.store_integer_value(cb, "666"_i256) << std::endl; std::cout << cb << std::endl; cs2 = td::Ref{true, cb.finalize()}; - std::cout << "Grams.validate(cs) = " << block::tlb::t_Grams.validate(*cs) << std::endl; - std::cout << "Grams.validate(cs2) = " << block::tlb::t_Grams.validate(*cs2) << std::endl; + std::cout << "Grams.validate(cs) = " << block::tlb::t_Grams.validate_upto(1024, *cs) << std::endl; + std::cout << "Grams.validate(cs2) = " << block::tlb::t_Grams.validate_upto(1024, *cs2) << std::endl; // block::gen::SplitMergeInfo::Record data; block::gen::Grams::Record data2; - std::cout << "block::gen::Grams.validate(cs) = " << block::gen::t_Grams.validate(*cs) << std::endl; - std::cout << "block::gen::Grams.validate(cs2) = " << block::gen::t_Grams.validate(*cs2) << std::endl; + std::cout << "block::gen::Grams.validate(cs) = " << block::gen::t_Grams.validate_upto(1024, *cs) << std::endl; + std::cout << "block::gen::Grams.validate(cs2) = " << block::gen::t_Grams.validate_upto(1024, *cs2) << std::endl; std::cout << "[cs = " << cs << "]" << std::endl; bool ok = tlb::csr_unpack_inexact(cs, data); std::cout << "block::gen::SplitMergeInfo.unpack(cs, data) = " << ok << std::endl; @@ -182,29 +182,38 @@ void test1() { } void test2(vm::CellSlice& cs) { - std::cout << "Bool.validate() = " << block::tlb::t_Bool.validate(cs) << std::endl; - std::cout << "UInt16.validate() = " << block::tlb::t_uint16.validate(cs) << std::endl; - std::cout << "HashmapE(32,UInt16).validate() = " << block::tlb::HashmapE(32, block::tlb::t_uint16).validate(cs) - << std::endl; + std::cout << "Bool.validate() = " << block::tlb::t_Bool.validate_upto(1024, cs) << std::endl; + std::cout << "UInt16.validate() = " << block::tlb::t_uint16.validate_upto(1024, cs) << std::endl; + std::cout << "HashmapE(32,UInt16).validate() = " + << block::tlb::HashmapE(32, block::tlb::t_uint16).validate_upto(1024, cs) << std::endl; std::cout << "block::gen::HashmapE(32,UInt16).validate() = " - << block::gen::HashmapE{32, block::gen::t_uint16}.validate(cs) << std::endl; + << block::gen::HashmapE{32, block::gen::t_uint16}.validate_upto(1024, cs) << std::endl; } void usage() { - std::cout << "usage: test-block [-S][]\n\tor test-block -h\n\tDumps specified blockchain block or state " - "from , or runs some tests\n\t-S\tDump a blockchain state\n"; + std::cout << "usage: dump-block [-t][-S][]\n\tor dump-block -h\n\tDumps specified blockchain " + "block or state " + "from , or runs some tests\n\t-S\tDump a blockchain state instead of a block\n"; std::exit(2); } int main(int argc, char* const argv[]) { int i; int new_verbosity_level = VERBOSITY_NAME(INFO); - bool dump_state = false; + const char* tname = nullptr; + const tlb::TLB* type = &block::gen::t_Block; auto zerostate = std::make_unique(); - while ((i = getopt(argc, argv, "Shv:")) != -1) { + while ((i = getopt(argc, argv, "CSt:hv:")) != -1) { switch (i) { + case 'C': + type = &block::gen::t_VmCont; + break; case 'S': - dump_state = true; + type = &block::gen::t_ShardStateUnsplit; + break; + case 't': + tname = optarg; + type = nullptr; break; case 'v': new_verbosity_level = VERBOSITY_NAME(FATAL) + (verbosity = td::to_integer(td::Slice(optarg))); @@ -230,12 +239,18 @@ int main(int argc, char* const argv[]) { vm::CellSlice cs{vm::NoVm(), boc}; cs.print_rec(std::cout); std::cout << std::endl; - auto& type = dump_state ? (const tlb::TLB&)block::gen::t_ShardStateUnsplit : block::gen::t_Block; - std::string type_name = dump_state ? "ShardState" : "Block"; - type.print_ref(std::cout, boc); + if (!type) { + tlb::TypenameLookup dict(block::gen::register_simple_types); + type = dict.lookup(tname); + if (!type) { + std::cerr << "unknown TL-B type " << tname << std::endl; + std::exit(3); + } + } + type->print_ref(std::cout, boc); std::cout << std::endl; - bool ok = type.validate_ref(boc); - std::cout << "(" << (ok ? "" : "in") << "valid " << type_name << ")" << std::endl; + bool ok = type->validate_ref(1048576, boc); + std::cout << "(" << (ok ? "" : "in") << "valid " << *type << ")" << std::endl; } } if (!done) { diff --git a/submodules/ton/tonlib-src/crypto/block/mc-config.cpp b/submodules/ton/tonlib-src/crypto/block/mc-config.cpp index b5959f7557..555b26033e 100644 --- a/submodules/ton/tonlib-src/crypto/block/mc-config.cpp +++ b/submodules/ton/tonlib-src/crypto/block/mc-config.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "mc-config.h" #include "block/block.h" @@ -567,6 +567,21 @@ td::Result Config::do_get_gas_limits_prices(td::Ref c } return res; } + +td::Result Config::get_dns_root_addr() const { + auto cell = get_config_param(4); + if (cell.is_null()) { + return td::Status::Error(PSLICE() << "configuration parameter " << 4 << " with dns root address is absent"); + } + auto cs = vm::load_cell_slice(std::move(cell)); + if (cs.size() != 0x100) { + return td::Status::Error(PSLICE() << "configuration parameter " << 4 << " with dns root address has wrong size"); + } + ton::StdSmcAddress res; + CHECK(cs.fetch_bits_to(res)); + return res; +} + td::Result Config::get_gas_limits_prices(bool is_masterchain) const { auto id = is_masterchain ? 20 : 21; auto cell = get_config_param(id); @@ -752,8 +767,8 @@ Ref McShardDescr::from_block(Ref block_root, Ref::max(); int len = id.pfx_len(); while (true) { - cs.load(vm::NoVmOrd{}, leaf ? root : std::move(root)); + cs.load(vm::NoVmOrd(), leaf ? root : std::move(root)); int t = (int)cs.fetch_ulong(1); if (t < 0) { return false; // throw DictError ? @@ -1108,7 +1123,7 @@ std::vector ShardConfig::get_shard_hash_ids( std::stack, unsigned long long>> stack; stack.emplace(cs_ref->prefetch_ref(), ton::shardIdAll); while (!stack.empty()) { - vm::CellSlice cs{vm::NoVm{}, std::move(stack.top().first)}; + vm::CellSlice cs{vm::NoVmOrd(), std::move(stack.top().first)}; unsigned long long shard = stack.top().second; stack.pop(); int t = (int)cs.fetch_ulong(1); @@ -1224,7 +1239,7 @@ bool ShardConfig::new_workchain(ton::WorkchainId workchain, ton::BlockSeqno reg_ cb.store_zeroes_bool( 1 + 5 + 5) // split_merge_at:FutureSplitMerge fees_collected:CurrencyCollection funds_created:CurrencyCollection - && cb.finalize_to(cell) && block::gen::t_BinTree_ShardDescr.validate_ref(cell) && + && cb.finalize_to(cell) && block::gen::t_BinTree_ShardDescr.validate_ref(1024, cell) && shard_hashes_dict_->set_ref(td::BitArray<32>{workchain}, std::move(cell), vm::Dictionary::SetMode::Add); } @@ -1454,7 +1469,7 @@ static bool btree_set(Ref& root, ton::ShardId shard, Ref val } bool ShardConfig::set_shard_info(ton::ShardIdFull shard, Ref value) { - if (!gen::t_BinTree_ShardDescr.validate_ref(value)) { + if (!gen::t_BinTree_ShardDescr.validate_ref(1024, value)) { LOG(ERROR) << "attempting to store an invalid (BinTree ShardDescr) at shard configuration position " << shard.to_str(); gen::t_BinTree_ShardDescr.print_ref(std::cerr, value); @@ -1710,6 +1725,30 @@ std::vector Config::compute_total_validator_set(int next) c return res.move_as_ok()->export_validator_set(); } +td::Result> Config::unpack_validator_set_start_stop(Ref vset_root) { + if (vset_root.is_null()) { + return td::Status::Error("validator set absent"); + } + gen::ValidatorSet::Record_validators_ext rec; + if (tlb::unpack_cell(vset_root, rec)) { + return std::pair(rec.utime_since, rec.utime_until); + } + gen::ValidatorSet::Record_validators rec0; + if (tlb::unpack_cell(std::move(vset_root), rec0)) { + return std::pair(rec0.utime_since, rec0.utime_until); + } + return td::Status::Error("validator set is invalid"); +} + +std::pair Config::get_validator_set_start_stop(int next) const { + auto res = unpack_validator_set_start_stop(get_config_param(next < 0 ? 32 : (next ? 36 : 34))); + if (res.is_error()) { + return {0, 0}; + } else { + return res.move_as_ok(); + } +} + bool WorkchainInfo::unpack(ton::WorkchainId wc, vm::CellSlice& cs) { workchain = ton::workchainInvalid; if (wc == ton::workchainInvalid) { diff --git a/submodules/ton/tonlib-src/crypto/block/mc-config.h b/submodules/ton/tonlib-src/crypto/block/mc-config.h index 241ae88c55..8541110ffe 100644 --- a/submodules/ton/tonlib-src/crypto/block/mc-config.h +++ b/submodules/ton/tonlib-src/crypto/block/mc-config.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with TON Blockchain. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "common/refcnt.hpp" @@ -50,7 +50,7 @@ struct ValidatorDescr { : pubkey(_pubkey), weight(_weight), cum_weight(_cum_weight) { adnl_addr.set_zero(); } - bool operator<(td::uint64 wt_pos) const& { + bool operator<(td::uint64 wt_pos) const & { return cum_weight < wt_pos; } }; @@ -534,6 +534,7 @@ class Config { bool create_stats_enabled() const { return has_capability(ton::capCreateStatsEnabled); } + td::Result get_dns_root_addr() const; bool set_block_id_ext(const ton::BlockIdExt& block_id_ext); td::Result> get_special_smartcontracts(bool without_config = false) const; bool is_special_smartcontract(const ton::StdSmcAddress& addr) const; @@ -558,6 +559,7 @@ class Config { const ValidatorSet* get_cur_validator_set() const { return cur_validators_.get(); } + std::pair get_validator_set_start_stop(int next = 0) const; ton::ValidatorSessionConfig get_consensus_config() const; bool foreach_config_param(std::function)> scan_func) const; Ref get_workchain_info(ton::WorkchainId workchain_id) const; @@ -577,6 +579,7 @@ class Config { static td::Result> unpack_config(Ref config_csr, int mode = 0); static td::Result> extract_from_state(Ref mc_state_root, int mode = 0); static td::Result> extract_from_key_block(Ref key_block_root, int mode = 0); + static td::Result> unpack_validator_set_start_stop(Ref root); protected: Config(int _mode) : mode(_mode) { diff --git a/submodules/ton/tonlib-src/crypto/block/transaction.cpp b/submodules/ton/tonlib-src/crypto/block/transaction.cpp index 6667cf8774..34abfff13d 100644 --- a/submodules/ton/tonlib-src/crypto/block/transaction.cpp +++ b/submodules/ton/tonlib-src/crypto/block/transaction.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "block/transaction.h" #include "block/block.h" @@ -23,7 +23,7 @@ #include "td/utils/bits.h" #include "td/utils/uint128.h" #include "ton/ton-shard.h" -#include "vm/continuation.h" +#include "vm/vm.h" namespace block { using td::Ref; @@ -150,7 +150,7 @@ bool Account::unpack_storage_info(vm::CellSlice& cs) { return false; } } else { - due_payment = td::RefInt256{true, 0}; + due_payment = td::zero_refint(); } unsigned long long u = 0; u |= storage_stat.cells = block::tlb::t_VarUInteger_7.as_uint(*used.cells); @@ -369,7 +369,7 @@ bool Account::init_new(ton::UnixTime now) { now_ = now; last_paid = 0; storage_stat.clear(); - due_payment = td::RefInt256{true, 0}; + due_payment = td::zero_refint(); balance.set_zero(); if (my_addr_exact.is_null()) { vm::CellBuilder cb; @@ -463,6 +463,7 @@ Transaction::Transaction(const Account& _account, int ttype, ton::LogicalTime re , my_addr(_account.my_addr) , my_addr_exact(_account.my_addr_exact) , balance(_account.balance) + , original_balance(_account.balance) , due_payment(_account.due_payment) , last_paid(_account.last_paid) , new_code(_account.code) @@ -472,6 +473,9 @@ Transaction::Transaction(const Account& _account, int ttype, ton::LogicalTime re start_lt = std::max(req_start_lt, account.last_trans_end_lt_); end_lt = start_lt + 1; acc_status = (account.status == Account::acc_nonexist ? Account::acc_uninit : account.status); + if (acc_status == Account::acc_frozen) { + frozen_hash = account.state_hash; + } } bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig* cfg) { @@ -503,7 +507,7 @@ bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig* if (ihr_delivered) { in_fwd_fee = std::move(ihr_fee); } else { - in_fwd_fee = td::RefInt256{true, 0}; + in_fwd_fee = td::zero_refint(); msg_balance_remaining += std::move(ihr_fee); } if (info.created_lt >= start_lt) { @@ -543,7 +547,7 @@ bool Transaction::unpack_input_msg(bool ihr_delivered, const ActionPhaseConfig* LOG(DEBUG) << "computed fwd fees set to zero for special account"; fees_c.first = fees_c.second = 0; } - in_fwd_fee = td::RefInt256{true, fees_c.first}; + in_fwd_fee = td::make_refint(fees_c.first); if (balance.grams < in_fwd_fee) { LOG(DEBUG) << "cannot pay for importing this external message"; return false; @@ -615,19 +619,19 @@ bool Transaction::prepare_storage_phase(const StoragePhaseConfig& cfg, bool forc res->is_special = account.is_special; last_paid = res->last_paid_updated = (res->is_special ? 0 : now); if (to_pay.is_null() || sgn(to_pay) == 0) { - res->fees_collected = res->fees_due = td::RefInt256{true, 0}; + res->fees_collected = res->fees_due = td::zero_refint(); } else if (to_pay <= balance.grams) { res->fees_collected = to_pay; - res->fees_due = td::RefInt256{true, 0}; + res->fees_due = td::zero_refint(); balance -= std::move(to_pay); } else if (acc_status == Account::acc_frozen && !force_collect && to_pay + due_payment < cfg.delete_due_limit) { // do not collect fee res->last_paid_updated = (res->is_special ? 0 : account.last_paid); - res->fees_collected = res->fees_due = td::RefInt256{true, 0}; + res->fees_collected = res->fees_due = td::zero_refint(); } else { res->fees_collected = balance.grams; res->fees_due = std::move(to_pay) - std::move(balance.grams); - balance.grams = td::RefInt256{true, 0}; + balance.grams = td::zero_refint(); if (!res->is_special) { auto total_due = res->fees_due + due_payment; switch (acc_status) { @@ -691,19 +695,23 @@ bool ComputePhaseConfig::parse_GasLimitsPrices(Ref cs, td::RefInt } block::gen::GasLimitsPrices::Record_gas_flat_pfx flat; if (tlb::csr_unpack(cs, flat)) { - bool ok = parse_GasLimitsPrices(std::move(flat.other), freeze_due_limit, delete_due_limit); - flat_gas_limit = flat.flat_gas_limit; - flat_gas_price = flat.flat_gas_price; - return ok; + return parse_GasLimitsPrices_internal(std::move(flat.other), freeze_due_limit, delete_due_limit, + flat.flat_gas_limit, flat.flat_gas_price); + } else { + return parse_GasLimitsPrices_internal(std::move(cs), freeze_due_limit, delete_due_limit); } - flat_gas_limit = flat_gas_price = 0; +} + +bool ComputePhaseConfig::parse_GasLimitsPrices_internal(Ref cs, td::RefInt256& freeze_due_limit, + td::RefInt256& delete_due_limit, td::uint64 _flat_gas_limit, + td::uint64 _flat_gas_price) { auto f = [&](const auto& r, td::uint64 spec_limit) { gas_limit = r.gas_limit; special_gas_limit = spec_limit; gas_credit = r.gas_credit; gas_price = r.gas_price; - freeze_due_limit = td::RefInt256{true, r.freeze_due_limit}; - delete_due_limit = td::RefInt256{true, r.delete_due_limit}; + freeze_due_limit = td::make_refint(r.freeze_due_limit); + delete_due_limit = td::make_refint(r.delete_due_limit); }; block::gen::GasLimitsPrices::Record_gas_prices_ext rec; if (tlb::csr_unpack(cs, rec)) { @@ -716,15 +724,17 @@ bool ComputePhaseConfig::parse_GasLimitsPrices(Ref cs, td::RefInt return false; } } + flat_gas_limit = _flat_gas_limit; + flat_gas_price = _flat_gas_price; compute_threshold(); return true; } void ComputePhaseConfig::compute_threshold() { - gas_price256 = td::RefInt256{true, gas_price}; + gas_price256 = td::make_refint(gas_price); if (gas_limit > flat_gas_limit) { max_gas_threshold = - td::rshift(gas_price256 * (gas_limit - flat_gas_limit), 16, 1) + td::make_refint(flat_gas_price); + td::rshift(gas_price256 * (gas_limit - flat_gas_limit), 16, 1) + td::make_bigint(flat_gas_price); } else { max_gas_threshold = td::make_refint(flat_gas_price); } @@ -821,8 +831,8 @@ Ref Transaction::prepare_vm_c7(const ComputePhaseConfig& cfg) const { } 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::zero_refint(), // actions:Integer + td::zero_refint(), // msgs_sent:Integer td::make_refint(now), // unixtime:Integer td::make_refint(account.block_lt), // block_lt:Integer td::make_refint(start_lt), // trans_lt:Integer @@ -906,6 +916,7 @@ bool Transaction::prepare_compute_phase(const ComputePhaseConfig& cfg) { // ... compute_phase = std::make_unique(); ComputePhase& cp = *(compute_phase.get()); + original_balance -= total_fees; if (td::sgn(balance.grams) <= 0) { // no gas cp.skip_reason = ComputePhase::sk_no_gas; @@ -1004,16 +1015,15 @@ bool Transaction::prepare_compute_phase(const ComputePhaseConfig& cfg) { } if (cp.accepted) { if (account.is_special) { - cp.gas_fees = td::RefInt256{true, 0}; + cp.gas_fees = td::zero_refint(); } else { cp.gas_fees = cfg.compute_gas_price(cp.gas_used); total_fees += cp.gas_fees; balance -= cp.gas_fees; } - if (verbosity > 2) { - std::cerr << "gas fees: " << cp.gas_fees << " = " << cfg.gas_price256 << " * " << cp.gas_used - << " /2^16 ; price=" << cfg.gas_price << "; remaining balance=" << balance << std::endl; - } + LOG(DEBUG) << "gas fees: " << cp.gas_fees->to_dec_string() << " = " << cfg.gas_price256->to_dec_string() << " * " + << cp.gas_used << " /2^16 ; price=" << cfg.gas_price << "; flat rate=[" << cfg.flat_gas_price << " for " + << cfg.flat_gas_limit << "]; remaining balance=" << balance.to_str(); CHECK(td::sgn(balance.grams) >= 0); } return true; @@ -1033,8 +1043,8 @@ bool Transaction::prepare_action_phase(const ActionPhaseConfig& cfg) { ap.action_list_hash = list->get_hash().bits(); ap.remaining_balance = balance; ap.end_lt = end_lt; - ap.total_fwd_fees = td::RefInt256{true, 0}; - ap.total_action_fees = td::RefInt256{true, 0}; + ap.total_fwd_fees = td::zero_refint(); + ap.total_action_fees = td::zero_refint(); ap.reserved_balance.set_zero(); int n = 0; @@ -1098,6 +1108,9 @@ bool Transaction::prepare_action_phase(const ActionPhaseConfig& cfg) { case block::gen::OutAction::action_reserve_currency: err_code = try_action_reserve_currency(cs, ap, cfg); break; + case block::gen::OutAction::action_change_library: + err_code = try_action_change_library(cs, ap, cfg); + break; } if (err_code) { ap.result_code = (err_code == -1 ? 34 : err_code); @@ -1148,6 +1161,56 @@ int Transaction::try_action_set_code(vm::CellSlice& cs, ActionPhase& ap, const A return 0; } +int Transaction::try_action_change_library(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg) { + block::gen::OutAction::Record_action_change_library rec; + if (!tlb::unpack_exact(cs, rec)) { + return -1; + } + // mode: +0 = remove library, +1 = add private library, +2 = add public library + Ref lib_ref = rec.libref->prefetch_ref(); + ton::Bits256 hash; + if (lib_ref.not_null()) { + hash = lib_ref->get_hash().bits(); + } else { + CHECK(rec.libref.write().fetch_ulong(1) == 0 && rec.libref.write().fetch_bits_to(hash)); + } + try { + vm::Dictionary dict{new_library, 256}; + if (!rec.mode) { + // remove library + dict.lookup_delete(hash); + LOG(DEBUG) << "removed " << ((rec.mode >> 1) ? "public" : "private") << " library with hash " << hash.to_hex(); + } else { + auto val = dict.lookup(hash); + if (val.not_null()) { + bool is_public = val->prefetch_ulong(1); + auto ref = val->prefetch_ref(); + if (hash == ref->get_hash().bits()) { + lib_ref = ref; + if (is_public == (rec.mode >> 1)) { + // library already in required state + ap.spec_actions++; + return 0; + } + } + } + if (lib_ref.is_null()) { + // library code not found + return 41; + } + vm::CellBuilder cb; + CHECK(cb.store_bool_bool(rec.mode >> 1) && cb.store_ref_bool(std::move(lib_ref))); + CHECK(dict.set_builder(hash, cb)); + LOG(DEBUG) << "added " << ((rec.mode >> 1) ? "public" : "private") << " library with hash " << hash.to_hex(); + } + new_library = std::move(dict).extract_root_cell(); + } catch (vm::VmError& vme) { + return 42; + } + ap.spec_actions++; + return 0; +} + // msg_fwd_fees = (lump_price + ceil((bit_price * msg.bits + cell_price * msg.cells)/2^16)) nanograms // ihr_fwd_fees = ceil((msg_fwd_fees * ihr_price_factor)/2^16) nanograms // bits in the root cell of a message are not included in msg.bits (lump_price pays for them) @@ -1369,7 +1432,7 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap, info.ihr_disabled = true; info.bounce = false; info.bounced = false; - fwd_fee = ihr_fee = td::RefInt256{true, 0}; + fwd_fee = ihr_fee = td::zero_refint(); } else { // int_msg_info$0 constructor if (!tlb::csr_unpack(msg.info, info) || !block::tlb::t_CurrencyCollection.validate_csr(info.value)) { @@ -1422,10 +1485,10 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap, // set fees to computed values if (fwd_fee->unsigned_fits_bits(63) && fwd_fee->to_long() < (long long)fees_c.first) { - fwd_fee = td::RefInt256{true, fees_c.first}; + fwd_fee = td::make_refint(fees_c.first); } if (fees_c.second && ihr_fee->unsigned_fits_bits(63) && ihr_fee->to_long() < (long long)fees_c.second) { - ihr_fee = td::RefInt256{true, fees_c.second}; + ihr_fee = td::make_refint(fees_c.second); } Ref new_msg; @@ -1442,7 +1505,7 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap, } if (info.ihr_disabled) { // if IHR is disabled, IHR fees will be always zero - ihr_fee = td::RefInt256{true, 0}; + ihr_fee = td::zero_refint(); } // extract value to be carried by the message block::CurrencyCollection req; @@ -1592,7 +1655,7 @@ int Transaction::try_action_send_msg(const vm::CellSlice& cs0, ActionPhase& ap, int Transaction::try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg) { block::gen::OutAction::Record_action_reserve_currency rec; - if (!tlb::unpack_exact(cs, rec) || (rec.mode & ~3)) { + if (!tlb::unpack_exact(cs, rec) || (rec.mode & ~15)) { return -1; } int mode = rec.mode; @@ -1603,7 +1666,21 @@ int Transaction::try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap, return -1; } LOG(DEBUG) << "action_reserve_currency: mode=" << mode << ", reserve=" << reserve.to_str() - << ", balance=" << ap.remaining_balance.to_str(); + << ", balance=" << ap.remaining_balance.to_str() << ", original balance=" << original_balance.to_str(); + if (mode & 4) { + if (mode & 8) { + reserve = original_balance - reserve; + } else { + reserve += original_balance; + } + } else if (mode & 8) { + LOG(DEBUG) << "invalid reserve mode " << mode; + return -1; + } + if (!reserve.is_valid() || td::sgn(reserve.grams) < 0) { + LOG(DEBUG) << "cannot reserve a negative amount: " << reserve.to_str(); + return -1; + } if (reserve.grams > ap.remaining_balance.grams) { if (mode & 2) { reserve.grams = ap.remaining_balance.grams; @@ -1683,10 +1760,10 @@ bool Transaction::prepare_bounce_phase(const ActionPhaseConfig& cfg) { balance -= msg_balance; CHECK(balance.is_valid()); // debit total forwarding fees from the message's balance, then split forwarding fees into our part and remaining part - msg_balance -= td::RefInt256{true, bp.fwd_fees}; + msg_balance -= td::make_refint(bp.fwd_fees); bp.fwd_fees_collected = msg_prices.get_first_part(bp.fwd_fees); bp.fwd_fees -= bp.fwd_fees_collected; - total_fees += td::RefInt256{true, bp.fwd_fees_collected}; + total_fees += td::make_refint(bp.fwd_fees_collected); // serialize outbound message info.created_lt = end_lt++; info.created_at = now; @@ -1771,7 +1848,7 @@ bool Transaction::compute_state() { // code:(Maybe ^Cell) data:(Maybe ^Cell) library:(HashmapE 256 SimpleLib) auto frozen_state = cb2.finalize(); frozen_hash = frozen_state->get_hash().bits(); - if (verbosity >= 3 * 0) { // !!!DEBUG!!! + if (verbosity >= 3 * 1) { // !!!DEBUG!!! std::cerr << "freezing state of smart contract: "; block::gen::t_StateInit.print_ref(std::cerr, frozen_state); CHECK(block::gen::t_StateInit.validate_ref(frozen_state)); diff --git a/submodules/ton/tonlib-src/crypto/block/transaction.h b/submodules/ton/tonlib-src/crypto/block/transaction.h index 25f8059560..5ab34710d0 100644 --- a/submodules/ton/tonlib-src/crypto/block/transaction.h +++ b/submodules/ton/tonlib-src/crypto/block/transaction.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "common/refcnt.hpp" @@ -65,10 +65,10 @@ struct NewOutMsg { NewOutMsg(ton::LogicalTime _lt, Ref _msg, Ref _trans) : lt(_lt), msg(std::move(_msg)), trans(std::move(_trans)) { } - bool operator<(const NewOutMsg& other) const& { + bool operator<(const NewOutMsg& other) const & { return lt < other.lt || (lt == other.lt && msg->get_hash() < other.msg->get_hash()); } - bool operator>(const NewOutMsg& other) const& { + bool operator>(const NewOutMsg& other) const & { return lt > other.lt || (lt == other.lt && other.msg->get_hash() < msg->get_hash()); } }; @@ -130,6 +130,11 @@ struct ComputePhaseConfig { } bool parse_GasLimitsPrices(Ref cs, td::RefInt256& freeze_due_limit, td::RefInt256& delete_due_limit); bool parse_GasLimitsPrices(Ref cell, td::RefInt256& freeze_due_limit, td::RefInt256& delete_due_limit); + + private: + bool parse_GasLimitsPrices_internal(Ref cs, td::RefInt256& freeze_due_limit, + td::RefInt256& delete_due_limit, td::uint64 flat_gas_limit = 0, + td::uint64 flat_gas_price = 0); }; struct ActionPhaseConfig { @@ -189,10 +194,6 @@ struct ActionPhase { Ref new_code; td::BitArray<256> action_list_hash; block::CurrencyCollection remaining_balance, reserved_balance; - // td::RefInt256 remaining_balance; - // Ref remaining_extra; - // td::RefInt256 reserved_balance; - // Ref reserved_extra; std::vector> action_list; // processed in reverse order std::vector> out_msgs; ton::LogicalTime end_lt; @@ -314,7 +315,7 @@ struct Transaction { const Account& account; // only `commit` method modifies the account Ref my_addr, my_addr_exact; // almost the same as in account.* ton::LogicalTime start_lt, end_lt; - block::CurrencyCollection balance; + block::CurrencyCollection balance, original_balance; block::CurrencyCollection msg_balance_remaining; td::RefInt256 due_payment; td::RefInt256 in_fwd_fee, msg_fwd_fees; @@ -371,6 +372,7 @@ struct Transaction { Ref prepare_vm_c7(const ComputePhaseConfig& cfg) const; bool prepare_rand_seed(td::BitArray<256>& rand_seed, const ComputePhaseConfig& cfg) const; int try_action_set_code(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg); + int try_action_change_library(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg); int try_action_send_msg(const vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg, int redoing = 0); int try_action_reserve_currency(vm::CellSlice& cs, ActionPhase& ap, const ActionPhaseConfig& cfg); bool check_replace_src_addr(Ref& src_addr) const; diff --git a/submodules/ton/tonlib-src/crypto/common/bigint.hpp b/submodules/ton/tonlib-src/crypto/common/bigint.hpp index 6734f07e32..7f6cf971e3 100644 --- a/submodules/ton/tonlib-src/crypto/common/bigint.hpp +++ b/submodules/ton/tonlib-src/crypto/common/bigint.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include @@ -169,6 +169,8 @@ class PropagateConstSpan { size_t size_{0}; }; +struct Normalize {}; + template class AnyIntView { public: @@ -308,6 +310,10 @@ class BigIntG { explicit BigIntG(word_t x) : n(1) { digits[0] = x; } + BigIntG(Normalize, word_t x) : n(1) { + digits[0] = x; + normalize_bool(); + } BigIntG(const BigIntG& x) : n(x.n) { std::memcpy(digits, x.digits, n * sizeof(word_t)); ///std::cout << "(BiCC " << (const void*)&x << "->" << (void*)this << ")"; @@ -2515,6 +2521,11 @@ extern template class AnyIntView; extern template class BigIntG<257, BigIntInfo>; typedef BigIntG<257, BigIntInfo> BigInt256; +template +BigIntG make_bigint(long long x) { + return BigIntG{Normalize(), x}; +} + namespace literals { extern BigInt256 operator""_i256(const char* str, std::size_t str_len); diff --git a/submodules/ton/tonlib-src/crypto/common/refint.cpp b/submodules/ton/tonlib-src/crypto/common/refint.cpp index 662322c62b..3a031a5a38 100644 --- a/submodules/ton/tonlib-src/crypto/common/refint.cpp +++ b/submodules/ton/tonlib-src/crypto/common/refint.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "common/refint.h" #include @@ -38,6 +38,11 @@ RefInt256 operator+(RefInt256 x, long long y) { return x; } +RefInt256 operator+(RefInt256 x, const BigInt256& y) { + (x.write() += y).normalize(); + return x; +} + RefInt256 operator-(RefInt256 x, RefInt256 y) { (x.write() -= *y).normalize(); return x; @@ -48,6 +53,11 @@ RefInt256 operator-(RefInt256 x, long long y) { return x; } +RefInt256 operator-(RefInt256 x, const BigInt256& y) { + (x.write() -= y).normalize(); + return x; +} + RefInt256 operator-(RefInt256 x) { x.write().negate().normalize(); return x; @@ -69,6 +79,12 @@ RefInt256 operator*(RefInt256 x, long long y) { return x; } +RefInt256 operator*(RefInt256 x, const BigInt256& y) { + RefInt256 z{true, 0}; + z.write().add_mul(*x, y).normalize(); + return z; +} + RefInt256 operator/(RefInt256 x, RefInt256 y) { RefInt256 quot{true}; x.write().mod_div(*y, quot.write()); @@ -142,6 +158,11 @@ RefInt256& operator+=(RefInt256& x, long long y) { return x; } +RefInt256& operator+=(RefInt256& x, const BigInt256& y) { + (x.write() += y).normalize(); + return x; +} + RefInt256& operator-=(RefInt256& x, RefInt256 y) { (x.write() -= *y).normalize(); return x; @@ -152,6 +173,11 @@ RefInt256& operator-=(RefInt256& x, long long y) { return x; } +RefInt256& operator-=(RefInt256& x, const BigInt256& y) { + (x.write() -= y).normalize(); + return x; +} + RefInt256& operator*=(RefInt256& x, RefInt256 y) { RefInt256 z{true, 0}; z.write().add_mul(*x, *y).normalize(); @@ -163,6 +189,12 @@ RefInt256& operator*=(RefInt256& x, long long y) { return x; } +RefInt256& operator*=(RefInt256& x, const BigInt256& y) { + RefInt256 z{true, 0}; + z.write().add_mul(*x, y).normalize(); + return x = z; +} + RefInt256& operator/=(RefInt256& x, RefInt256 y) { RefInt256 quot{true}; x.write().mod_div(*y, quot.write()); @@ -213,10 +245,20 @@ int sgn(RefInt256 x) { return x->sgn(); } -extern RefInt256 make_refint(long long x) { - auto xx = td::RefInt256{true, x}; - xx.unique_write().normalize(); - return xx; +RefInt256 make_refint(long long x) { + return td::RefInt256{true, td::Normalize(), x}; +} + +RefInt256 zero_refint() { + // static RefInt256 Zero = td::RefInt256{true, 0}; + // return Zero; + return td::RefInt256{true, 0}; +} + +RefInt256 bits_to_refint(td::ConstBitPtr bits, int n, bool sgnd) { + td::RefInt256 x{true}; + x.unique_write().import_bits(bits, n, sgnd); + return x; } std::string dec_string(RefInt256 x) { diff --git a/submodules/ton/tonlib-src/crypto/common/refint.h b/submodules/ton/tonlib-src/crypto/common/refint.h index a828caf162..ea1ae81b7f 100644 --- a/submodules/ton/tonlib-src/crypto/common/refint.h +++ b/submodules/ton/tonlib-src/crypto/common/refint.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -33,10 +33,13 @@ typedef Ref RefInt256; extern RefInt256 operator+(RefInt256 x, RefInt256 y); extern RefInt256 operator+(RefInt256 x, long long y); +extern RefInt256 operator+(RefInt256 x, const BigInt256& y); extern RefInt256 operator-(RefInt256 x, RefInt256 y); extern RefInt256 operator-(RefInt256 x, long long y); +extern RefInt256 operator-(RefInt256 x, const BigInt256& y); extern RefInt256 operator*(RefInt256 x, RefInt256 y); extern RefInt256 operator*(RefInt256 x, long long y); +extern RefInt256 operator*(RefInt256 x, const BigInt256& y); extern RefInt256 operator/(RefInt256 x, RefInt256 y); extern RefInt256 operator%(RefInt256 x, RefInt256 y); extern RefInt256 div(RefInt256 x, RefInt256 y, int round_mode = -1); @@ -53,10 +56,13 @@ extern RefInt256 rshift(RefInt256 x, int y, int round_mode = -1); extern RefInt256& operator+=(RefInt256& x, RefInt256 y); extern RefInt256& operator+=(RefInt256& x, long long y); +extern RefInt256& operator+=(RefInt256& x, const BigInt256& y); extern RefInt256& operator-=(RefInt256& x, RefInt256 y); extern RefInt256& operator-=(RefInt256& x, long long y); +extern RefInt256& operator-=(RefInt256& x, const BigInt256& y); extern RefInt256& operator*=(RefInt256& x, RefInt256 y); extern RefInt256& operator*=(RefInt256& x, long long y); +extern RefInt256& operator*=(RefInt256& x, const BigInt256& y); extern RefInt256& operator/=(RefInt256& x, RefInt256 y); extern RefInt256& operator%=(RefInt256& x, RefInt256 y); @@ -100,8 +106,16 @@ extern int cmp(RefInt256 x, RefInt256 y); extern int cmp(RefInt256 x, long long y); extern int sgn(RefInt256 x); +template +RefInt256 make_refint(Args&&... args) { + return td::RefInt256{true, std::forward(args)...}; +} + extern RefInt256 make_refint(long long x); +extern RefInt256 zero_refint(); +extern RefInt256 bits_to_refint(td::ConstBitPtr bits, int n, bool sgnd = false); + extern std::string dec_string(RefInt256 x); extern std::string dec_string2(RefInt256&& x); extern std::string hex_string(RefInt256 x, bool upcase = false); diff --git a/submodules/ton/tonlib-src/crypto/common/util.cpp b/submodules/ton/tonlib-src/crypto/common/util.cpp index 721181524d..d1b24a76bc 100644 --- a/submodules/ton/tonlib-src/crypto/common/util.cpp +++ b/submodules/ton/tonlib-src/crypto/common/util.cpp @@ -14,12 +14,15 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "util.h" #include +#include "td/utils/crypto.h" +#include "td/utils/base64.h" + namespace td { std::size_t compute_base64_encoded_size(size_t bindata_size) { @@ -73,10 +76,6 @@ std::size_t buff_base64_encode(td::MutableSlice buffer, td::Slice raw, bool base return res_size; } -std::string str_base64_encode(std::string raw, bool base64_url) { - return str_base64_encode(td::Slice{raw}, base64_url); -} - std::string str_base64_encode(td::Slice raw, bool base64_url) { std::size_t res_size = compute_base64_encoded_size(raw.size()); std::string s; @@ -87,10 +86,6 @@ std::string str_base64_encode(td::Slice raw, bool base64_url) { return s; } -bool is_valid_base64(std::string encoded, bool allow_base64_url) { - return is_valid_base64(td::Slice{encoded}, allow_base64_url); -} - bool is_valid_base64(td::Slice encoded, bool allow_base64_url) { const unsigned char *ptr = (const unsigned char *)encoded.data(), *end = ptr + encoded.size(); if (encoded.size() & 3) { @@ -110,10 +105,6 @@ bool is_valid_base64(td::Slice encoded, bool allow_base64_url) { return ptr == end; } -td::int32 decoded_base64_size(std::string encoded, bool allow_base64_url) { - return decoded_base64_size(td::Slice{encoded}, allow_base64_url); -} - td::int32 decoded_base64_size(td::Slice encoded, bool allow_base64_url) { const unsigned char *ptr = (const unsigned char *)encoded.data(), *end = ptr + encoded.size(); if (encoded.size() & 3) { @@ -172,10 +163,6 @@ std::size_t buff_base64_decode(td::MutableSlice buffer, td::Slice encoded, bool return wptr - (unsigned char *)buffer.data(); } -td::BufferSlice base64_decode(std::string encoded, bool allow_base64_url) { - return base64_decode(td::Slice{encoded}, allow_base64_url); -} - td::BufferSlice base64_decode(td::Slice encoded, bool allow_base64_url) { auto s = decoded_base64_size(encoded, allow_base64_url); if (s <= 0) { @@ -190,10 +177,6 @@ td::BufferSlice base64_decode(td::Slice encoded, bool allow_base64_url) { return res; } -std::string str_base64_decode(std::string encoded, bool allow_base64_url) { - return str_base64_decode(td::Slice{encoded}, allow_base64_url); -} - std::string str_base64_decode(td::Slice encoded, bool allow_base64_url) { auto s = decoded_base64_size(encoded, allow_base64_url); if (s <= 0) { @@ -209,4 +192,45 @@ std::string str_base64_decode(td::Slice encoded, bool allow_base64_url) { return res; } +td::Result adnl_id_encode(td::Slice id, bool upper_case) { + if (id.size() != 32) { + return td::Status::Error("Wrong andl id size"); + } + td::uint8 buf[35]; + td::MutableSlice buf_slice(buf, 35); + buf_slice[0] = 0x2d; + buf_slice.substr(1).copy_from(id); + auto hash = td::crc16(buf_slice.substr(0, 33)); + buf[33] = static_cast((hash >> 8) & 255); + buf[34] = static_cast(hash & 255); + return td::base32_encode(buf_slice, upper_case).substr(1); +} + +std::string adnl_id_encode(td::Bits256 adnl_addr, bool upper_case) { + return adnl_id_encode(adnl_addr.as_slice(), upper_case).move_as_ok(); +} + +td::Result adnl_id_decode(td::Slice id) { + if (id.size() != 55) { + return td::Status::Error("Wrong length of adnl id"); + } + td::uint8 buf[56]; + buf[0] = 'f'; + td::MutableSlice buf_slice(buf, 56); + buf_slice.substr(1).copy_from(id); + TRY_RESULT(decoded_str, td::base32_decode(buf_slice)); + auto decoded = td::Slice(decoded_str); + if (decoded[0] != 0x2d) { + return td::Status::Error("Invalid first byte"); + } + auto got_hash = (decoded.ubegin()[33] << 8) | decoded.ubegin()[34]; + auto hash = td::crc16(decoded.substr(0, 33)); + if (hash != got_hash) { + return td::Status::Error("Hash mismatch"); + } + Bits256 res; + res.as_slice().copy_from(decoded.substr(1, 32)); + return res; +} + } // namespace td diff --git a/submodules/ton/tonlib-src/crypto/common/util.h b/submodules/ton/tonlib-src/crypto/common/util.h index 2a594efc76..e6b8ec2ebb 100644 --- a/submodules/ton/tonlib-src/crypto/common/util.h +++ b/submodules/ton/tonlib-src/crypto/common/util.h @@ -14,29 +14,31 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include #include "td/utils/Slice.h" #include "td/utils/buffer.h" +#include "bitstring.h" + namespace td { std::size_t compute_base64_encoded_size(size_t bindata_size); std::size_t buff_base64_encode(td::MutableSlice buffer, td::Slice raw, bool base64_url = false); -std::string str_base64_encode(std::string raw, bool base64_url = false); std::string str_base64_encode(td::Slice raw, bool base64_url = false); -bool is_valid_base64(std::string encoded, bool allow_base64_url = true); bool is_valid_base64(td::Slice encoded, bool allow_base64_url = true); -td::int32 decoded_base64_size(std::string encoded, bool allow_base64_url = true); td::int32 decoded_base64_size(td::Slice encoded, bool allow_base64_url = true); std::size_t buff_base64_decode(td::MutableSlice buffer, td::Slice data, bool allow_base64_url = true); -td::BufferSlice base64_decode(std::string encoded, bool allow_base64_url = true); td::BufferSlice base64_decode(td::Slice encoded, bool allow_base64_url = true); -std::string str_base64_decode(std::string encoded, bool allow_base64_url = true); std::string str_base64_decode(td::Slice encoded, bool allow_base64_url = true); +//TODO: move it somewhere else +td::Result adnl_id_encode(td::Slice id, bool upper_case = false); +std::string adnl_id_encode(Bits256 adnl_addr, bool upper_case = false); +td::Result adnl_id_decode(td::Slice id); + } // namespace td diff --git a/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp b/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp index f2da340973..a091c04955 100644 --- a/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp +++ b/submodules/ton/tonlib-src/crypto/fift/IntCtx.cpp @@ -71,6 +71,7 @@ IntCtx::Savepoint::Savepoint(IntCtx& _ctx, std::string new_filename, std::string std::istream* new_input_stream) : ctx(_ctx) , old_line_no(_ctx.line_no) + , old_need_line(_ctx.need_line) , old_filename(_ctx.filename) , old_current_dir(_ctx.currentd_dir) , old_input_stream(_ctx.input_stream) @@ -87,6 +88,7 @@ IntCtx::Savepoint::Savepoint(IntCtx& _ctx, std::string new_filename, std::string IntCtx::Savepoint::~Savepoint() { ctx.line_no = old_line_no; + ctx.need_line = old_need_line; ctx.filename = old_filename; ctx.currentd_dir = old_current_dir; ctx.input_stream = old_input_stream; @@ -99,6 +101,7 @@ bool IntCtx::load_next_line() { if (!std::getline(*input_stream, str)) { return false; } + need_line = false; if (!str.empty() && str.back() == '\r') { str.pop_back(); } @@ -111,6 +114,7 @@ bool IntCtx::is_sb() const { } td::Slice IntCtx::scan_word_to(char delim, bool err_endl) { + load_next_line_ifreq(); auto ptr = input_ptr; while (*ptr && *ptr != delim) { ptr++; @@ -121,6 +125,7 @@ td::Slice IntCtx::scan_word_to(char delim, bool err_endl) { } else if (err_endl && delim) { throw IntError{std::string{"end delimiter `"} + delim + "` not found"}; } else { + need_line = true; std::swap(ptr, input_ptr); return td::Slice{ptr, input_ptr}; } diff --git a/submodules/ton/tonlib-src/crypto/fift/IntCtx.h b/submodules/ton/tonlib-src/crypto/fift/IntCtx.h index 1adb8f325a..b2725cdae8 100644 --- a/submodules/ton/tonlib-src/crypto/fift/IntCtx.h +++ b/submodules/ton/tonlib-src/crypto/fift/IntCtx.h @@ -68,6 +68,7 @@ struct IntCtx { int state{0}; int include_depth{0}; int line_no{0}; + bool need_line{true}; std::string filename; std::string currentd_dir; std::istream* input_stream{nullptr}; @@ -116,6 +117,9 @@ struct IntCtx { } bool load_next_line(); + bool load_next_line_ifreq() { + return need_line && load_next_line(); + } bool is_sb() const; @@ -126,6 +130,7 @@ struct IntCtx { class Savepoint { IntCtx& ctx; int old_line_no; + bool old_need_line; std::string old_filename; std::string old_current_dir; std::istream* old_input_stream; diff --git a/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp b/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp index 8702f13dcb..077cdeccfc 100644 --- a/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp +++ b/submodules/ton/tonlib-src/crypto/fift/fift-main.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/stack.hpp" #include @@ -156,7 +156,7 @@ int main(int argc, char* const argv[]) { } fift::init_words_common(config.dictionary); - fift::init_words_vm(config.dictionary); + fift::init_words_vm(config.dictionary, true); // enable vm debug fift::init_words_ton(config.dictionary); if (script_mode) { diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif b/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif index eb9034ec1e..ced35d6fd1 100644 --- a/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif +++ b/submodules/ton/tonlib-src/crypto/fift/lib/Asm.fif @@ -165,6 +165,8 @@ x{68} @Defop DEPTH x{69} @Defop CHKDEPTH x{6A} @Defop ONLYTOPX x{6B} @Defop ONLYX +{ over 0= abort"first argument must be non-zero" + idict! + not abort"cannot add key to procedure info dictionary" + @procinfo ! +} : @procinfo! +// ( x v1 v2 -- ) +{ not 2 pick @procinfo@ and xor swap @procinfo! } : @procinfo~! +// ( s i f -- ) +{ over @procdictkeylen fits not abort"procedure index out of range" + over swap dup @procinfo~! 2dup @proclistadd + 1 'nop does swap 0 (create) } : @declproc -{ @proccnt @ 1+ dup @proccnt ! @declproc } : @newproc -{ 0 =: main @proclist null! @proccnt 0! +{ 1 'nop does swap 0 (create) } : @declglobvar +{ @proccnt @ 1+ dup @proccnt ! 1 @declproc } : @newproc +{ @gvarcnt @ 1+ dup @gvarcnt ! @declglobvar } : @newglobvar +{ 0 =: main @proclist null! @proccnt 0! @gvarcnt 0! { bl word @newproc } : NEWPROC { bl word dup (def?) ' drop ' @newproc cond } : DECLPROC { bl word dup find { nip execute <> abort"method redefined with different id" } - { swap @declproc } + { swap 17 @declproc } cond } : DECLMETHOD - "main" @proclistadd - dictnew @procdict ! + { bl word @newglobvar } : DECLGLOBVAR + "main" 0 @proclistadd + dictnew dup @procdict ! + @procinfo ! 16 0 @procinfo! } : PROGRAM{ { over sbits < { s>c } : }END> +{ }END <{ SETCP0 swap @procdictkeylen DICTPUSHCONST DICTIGETJMPZ 11 THROWARG }> } : }END> { }END> b> } : }END>c { }END>c s @@ -1116,6 +1187,14 @@ forget @proclist forget @proccnt -3 constant split_prepare -4 constant split_install +{ asm-mode 0 3 ~! } : asm-no-remove-unused +{ asm-mode 1 1 ~! } : asm-remove-unused // enabled by default +{ asm-mode 3 3 ~! } : asm-warn-remove-unused +{ asm-mode 4 4 ~! } : asm-warn-inline-mix +{ asm-mode 0 4 ~! } : asm-no-warn-inline-mix // disabled by default +{ asm-mode 8 8 ~! } : asm-warn-unused +{ asm-mode 0 8 ~! } : asm-no-warn-unused // disabled by default + // ( c -- ) add vm library for later use with runvmcode { = -rot <= and } : s-fits? +// b s x -- ? +{ swap sbitrefs -rot + rot brembitrefs -rot <= -rot <= and } : s-fits-with? { 0 swap ! } : 0! { tuck @ + swap ! } : +! { tuck @ swap - swap ! } : -! { 1 swap +! } : 1+! { -1 swap +! } : 1-! { null swap ! } : null! +{ not 2 pick @ and xor swap ! } : ~! 0 tuple constant nil { 1 tuple } : single { 2 tuple } : pair @@ -111,3 +114,20 @@ variable base { true (atom) drop } : atom { bl word atom 1 'nop } ::_ ` { hole dup 1 { @ execute } does create } : recursive +{ 0 { 1+ dup 1 ' $() does over (.) "$" swap $+ 0 (create) } rot times drop } : :$1..n +{ 10 hold } : +cr +{ 9 hold } : +tab +{ "" swap { 0 word 2dup $cmp } { rot swap $+ +cr swap } while 2drop } : scan-until-word +{ 0 word -trailing scan-until-word 1 'nop } ::_ $<< +{ 0x40 runvmx } : runvmcode +{ 0x48 runvmx } : gasrunvmcode +{ 0x43 runvmx } : runvmdict +{ 0x4b runvmx } : gasrunvmdict +{ 0x45 runvmx } : runvm +{ 0x4d runvmx } : gasrunvm +{ 0x55 runvmx } : runvmctx +{ 0x5d runvmx } : gasrunvmctx +{ 0x75 runvmx } : runvmctxact +{ 0x7d runvmx } : gasrunvmctxact +{ 0x35 runvmx } : runvmctxactq +{ 0x3d runvmx } : gasrunvmctxactq diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/GetOpt.fif b/submodules/ton/tonlib-src/crypto/fift/lib/GetOpt.fif new file mode 100644 index 0000000000..442552b636 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/fift/lib/GetOpt.fif @@ -0,0 +1,131 @@ +library GetOpt // Simple command-line options parser +"Lists.fif" include + +// May be used as follows: +// begin-options +// "h" { ."Help Message" 0 halt } short-option +// "v" { parse-int =: verbosity } short-option-arg +// "i" "--interactive" { true =: interactive } short-long-option +// parse-options + +// ( l -- l') computes tail of list l if non-empty; else () +{ dup null? ' cdr ifnot } : safe-cdr +// ( l c -- l') deletes first c elements from list l +{ ' safe-cdr swap times } : list-delete-first +// ( l n c -- l' ) deletes c elements starting from n-th in list l +recursive list-delete-range { + dup 0<= { 2drop } { + over 0<= { nip list-delete-first } { + swap 1- swap rot uncons 2swap list-delete-range cons + } cond } cond +} swap ! +// ( n c -- ) deletes $n .. $(n+c-1) from the argument list $* +{ swap 1- $* @ swap rot list-delete-range $* ! } : $*del.. +// ( s s' -- ? ) checks whether s' is a prefix of s +{ tuck $len over $len over >= { $| drop $= } { 2drop drop false } cond +} : $pfx? +// ( s -- ? ) checks whether s is an option (a string beginning with '-') +{ dup $len 1 > { "-" $pfx? } { drop false } cond } : is-opt? +// ( s -- ? ) checks whether s is a digit option +{ 2 $| drop 1 $| nip $>B 8 B>u@ dup 57 <= swap 48 >= and } : is-digit-opt? +0 box constant disable-digit-opts +// ( l -- s i or 0 ) finds first string in l beginning with '-' +{ 0 { 1+ over null? { 2drop 0 true } { + swap uncons over is-opt? + { disable-digit-opts @ { over is-digit-opt? not } { true } cond } { false } cond + { drop swap true } { nip swap false } cond + } cond } until +} : list-find-opt +// ( -- s i or 0 ) finds first option in cmdline args +{ $* @ list-find-opt } : first-opt +' second : get-opt-flags +' first : get-opt-exec +// ( s t -- ? ) checks whether short/long option s matches description t +{ third $= } : short-option-matches +{ dup get-opt-flags 4 and 0= 3 + [] $= +} : long-option-matches +// ( t -- s -1 or 0 ) extracts help message from description +{ dup get-opt-flags 4 and 0= 4 + over count over > + { [] true } { 2drop false } cond +} : get-opt-help +// ( s l -- t -1 or 0 ) finds short/long option s in list l +{ swap 1 { swap short-option-matches } does assoc-gen +} : lookup-short-option +{ swap 1 { swap long-option-matches } does assoc-gen +} : lookup-long-option +// ( s -- s' null or s' s'' ) Splits long option --opt=arg at '=' +{ dup "=" $pos 1+ ?dup { tuck $| swap rot 1- $| drop swap } { null } cond +} : split-longopt +// ( l -- f or 0 ) Extracts global option flags from first entry of l +{ dup null? { drop 0 } { car get-opt-flags -256 and } cond +} : get-global-option-flags +variable options-list +// ( l -- i or 0 ) +// parses command line arguments according to option description list l +// and returns index i of first incorrect option +{ dup options-list ! get-global-option-flags + 256 and disable-digit-opts ! + { first-opt dup 0= { true } { + swap dup "--" $pfx? { // i s + dup $len 2 = { drop dup 1 $*del.. 0 true } { + split-longopt swap options-list @ + lookup-long-option not { drop true } { // i s' t f + dup get-opt-exec swap get-opt-flags 3 and // i s' e f' + 2 pick null? { dup 1 = } { dup 0= negate } cond // i s' e f' f'' + dup 1 = { 2drop 2drop true } { + { drop nip over 1+ $() swap execute 2 $*del.. false } { + ' nip ifnot execute 1 $*del.. false + } cond } cond } cond } cond } { // i s + 1 $| nip { + dup $len 0= { drop 1 $*del.. false true } { + 1 $| swap options-list @ // i s' s l + lookup-short-option not { drop true true } { // i s' t + dup get-opt-exec swap get-opt-flags 3 and // i s' e f' + ?dup 0= { execute false } { + 2 pick $len { drop execute "" false } { + 2 = { nip null swap execute "" false } { // i e + nip over 1+ $() swap execute 2 $*del.. false true + } cond } cond } cond } cond } cond } until + } cond + } cond } until +} : getopt +// ( t -- ) Displays help message for one option +{ dup get-opt-flags dup 4 and 2 pick third swap { + ."-" type ."/" over 3 [] type } { + dup $len { dup "--" $pfx? { ."-" } ifnot type } { + drop ."usage: " $0 type + } cond } cond + dup 3 and ?dup { + 2 = { ."[=]" } { ."=" } cond + } if + 8 and { 9 emit } ifnot + get-opt-help { type } { ."No help available" } cond cr +} : show-opt-help +// ( -- ) Displays options help message according to options-list +{ options-list @ { dup null? not } { + uncons swap show-opt-help + } while drop +} : show-options-help +// ( l -- ) Parses options and throws an error on failure +{ getopt ?dup { + $() "cannot parse command line options near `" swap $+ +"`" + show-options-help abort } if +} : run-getopt +anon constant opt-list-marker +' opt-list-marker : begin-options +{ opt-list-marker list-until-marker } : end-options +{ end-options run-getopt } : parse-options +// ( s e -- o ) Creates short/long option s with execution token e +{ 0 rot triple } dup : short-option : long-option +// ( s s' e -- o ) Creates a combined short option s and long option s' with execution token e +{ 4 2swap 4 tuple } : short-long-option +{ 1 rot triple } dup : short-option-arg : long-option-arg +{ 2 rot triple } dup : short-option-?arg : long-option-?arg +{ 5 2swap 4 tuple } : short-long-option-arg +{ 6 2swap 4 tuple } : short-long-option-?arg +// ( o s -- s' ) Adds help message to option +' , : option-help +// ( s f -- o ) Creates a generic help message +{ swap 'nop rot "" 3 roll 4 tuple } : generic-help-setopt +{ 0 generic-help-setopt } : generic-help +256 constant disable-digit-options diff --git a/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif b/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif index 7f1a376bb5..0e2155e178 100644 --- a/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif +++ b/submodules/ton/tonlib-src/crypto/fift/lib/TonUtil.fif @@ -12,6 +12,8 @@ library TonUtil // TON Blockchain Fift Library { (number) 1- abort"integer expected" } : parse-int +{ over null? ' swap if drop } : replace-if-null + // Private key load/generate // ( fname -- pubkey privkey ) { dup ."Loading private key from file " type cr @@ -32,8 +34,10 @@ library TonUtil // TON Blockchain Fift Library 1 and 0= } : parse-smc-addr +// ( x -- ) Displays a 64-digit hex number +{ 64 0x. } : 64x. // ( wc addr -- ) Show address in : form -{ swap ._ .":" 64 0x. } : .addr +{ swap ._ .":" 64x. } : .addr // ( wc addr flags -- ) Show address in base64url form { smca>$ type } : .Addr // ( wc addr fname -- ) Save address to file in 36-byte format @@ -65,6 +69,9 @@ library TonUtil // TON Blockchain Fift Library // ( b wc addr -- b' ) Serializes address into Builder b { -rot 8 i, swap 256 u, } : addr, +{ over 8 fits { rot b{100} s, -rot addr, } { + rot b{110} s, 256 9 u, rot 32 i, swap 256 u, } cond +} : Addr, // Gram utilities 1000000000 constant Gram @@ -148,3 +155,46 @@ recursive append-long-bytes { // ( x -- S ) serialize public key { 256 u>B B{3ee6} swap B+ dup crc16 16 u>B B+ B>base64 } : pubkey>$ { pubkey>$ type } : .pubkey + +// adnl address parser +{ 256 u>B B{2D} swap B+ dup crc16 16 u>B B+ } : adnl-preconv +{ swap 32 /mod dup 26 < { 65 } { 24 } cond + rot swap hold } : Base32# +{ <# ' Base32# 8 times #> } : Base32#*8 +{ "" over Blen 5 / { swap 40 B>u@+ Base32#*8 nip rot swap $+ } swap times nip } : B>Base32 + +// ( x -- S ) Converts an adnl-address from a 256-bit integer to a string +{ adnl-preconv B>Base32 1 $| nip } : adnl>$ + +{ 65 - dup 0>= { -33 and dup 26 < } { 41 + dup 25 > over 32 < and } cond ?dup nip } : Base32-digit? +{ Base32-digit? not abort"not a Base32 digit" } : Base32-digit +{ 0 { over $len } { swap 1 $| -rot (char) Base32-digit swap 5 << + } while nip } : Base32-number +{ B{} { over $len } { swap 8 $| -rot Base32-number 40 u>B B+ } while nip } : Base32>B + +// ( S -- x ) Converts an adnl address from a string to 256-bit integer +{ dup $len 55 <> abort"not 55 alphanumeric characters" "F" swap $+ Base32>B + 33 B| 16 B>u@ over crc16 <> abort"crc16 checksum mismatch" + 8 B>u@+ 0x2D <> abort"not a valid adnl address" 256 B>u@ } : $>adnl + +{ 65 - dup 0>= { -33 and 10 + dup 16 < } { 17 + dup 0>= over 10 < and } cond ?dup nip } : hex-digit? +// ( S -- x -1 or 0 ) Parses a hexadecimal integer +{ dup $len { + 0 { + 4 << swap 1 $| -rot (char) hex-digit? // S a d -1 or S a 0 + { + over $len 0= } { drop -1 true } cond + } until + dup 0< { 2drop false } { nip true } cond + } { drop false } cond +} : hex$>u? +// ( S -- x ) +{ hex$>u? not abort"not a hexadecimal number" } : hex$>u + +{ dup $len 64 = { hex$>u } { + dup $len 55 = { $>adnl } { + true abort"invalid adnl address" + } cond } cond +} : parse-adnl-addr +{ adnl>$ type } : .adnl +{ bl word parse-adnl-addr 1 'nop } ::_ adnl: + +// ( x a b -- a<=x<=b ) +{ 2 pick >= -rot >= and } : in-range? diff --git a/submodules/ton/tonlib-src/crypto/fift/utils.cpp b/submodules/ton/tonlib-src/crypto/fift/utils.cpp index fdbd0c7eef..3ed11c31b6 100644 --- a/submodules/ton/tonlib-src/crypto/fift/utils.cpp +++ b/submodules/ton/tonlib-src/crypto/fift/utils.cpp @@ -46,6 +46,9 @@ td::Result load_Lists_fif(std::string dir = "") { td::Result load_Lisp_fif(std::string dir = "") { return load_source("Lisp.fif", dir); } +td::Result load_GetOpt_fif(std::string dir = "") { + return load_source("GetOpt.fif", dir); +} class MemoryFileLoader : public fift::FileLoader { public: @@ -115,6 +118,10 @@ td::Result create_source_lookup(std::string main, bool need_ TRY_RESULT(f, load_TonUtil_fif(dir)); loader->add_file("/TonUtil.fif", std::move(f)); } + { + TRY_RESULT(f, load_GetOpt_fif(dir)); + loader->add_file("/GetOpt.fif", std::move(f)); + } } if (need_lisp) { TRY_RESULT(f, load_Lisp_fif(dir)); diff --git a/submodules/ton/tonlib-src/crypto/fift/words.cpp b/submodules/ton/tonlib-src/crypto/fift/words.cpp index 2c1a3083d6..3afd687ec4 100644 --- a/submodules/ton/tonlib-src/crypto/fift/words.cpp +++ b/submodules/ton/tonlib-src/crypto/fift/words.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "words.h" @@ -32,7 +32,7 @@ #include "vm/cells.h" #include "vm/cellslice.h" -#include "vm/continuation.h" +#include "vm/vm.h" #include "vm/cp0.h" #include "vm/dict.h" #include "vm/boc.h" @@ -96,6 +96,10 @@ void interpret_dotstack_list(IntCtx& ctx) { *ctx.output_stream << std::endl; } +void interpret_dotstack_list_dump(IntCtx& ctx) { + ctx.stack.dump(*ctx.output_stream, 3); +} + void interpret_dump(IntCtx& ctx) { ctx.stack.pop_chk().dump(*ctx.output_stream); *ctx.output_stream << ' '; @@ -105,6 +109,10 @@ void interpret_dump_internal(vm::Stack& stack) { stack.push_string(stack.pop_chk().to_string()); } +void interpret_list_dump_internal(vm::Stack& stack) { + stack.push_string(stack.pop_chk().to_lisp_string()); +} + void interpret_print_list(IntCtx& ctx) { ctx.stack.pop_chk().print_list(*ctx.output_stream); *ctx.output_stream << ' '; @@ -172,9 +180,9 @@ void interpret_times_div(vm::Stack& stack, int round_mode) { auto z = stack.pop_int(); auto y = stack.pop_int(); auto x = stack.pop_int(); - td::BigIntG<257 * 2> tmp{0}; + typename td::BigInt256::DoubleInt tmp{0}; tmp.add_mul(*x, *y); - auto q = td::RefInt256{true}; + auto q = td::make_refint(); tmp.mod_div(*z, q.unique_write(), round_mode); q.unique_write().normalize(); stack.push_int(std::move(q)); @@ -184,26 +192,23 @@ void interpret_times_divmod(vm::Stack& stack, int round_mode) { auto z = stack.pop_int(); auto y = stack.pop_int(); auto x = stack.pop_int(); - td::BigIntG<257 * 2> tmp{0}; + typename td::BigInt256::DoubleInt tmp{0}; tmp.add_mul(*x, *y); - auto q = td::RefInt256{true}; + auto q = td::make_refint(); tmp.mod_div(*z, q.unique_write(), round_mode); q.unique_write().normalize(); - auto r = td::RefInt256{true, tmp}; stack.push_int(std::move(q)); - stack.push_int(std::move(r)); + stack.push_int(td::make_refint(tmp)); } void interpret_times_mod(vm::Stack& stack, int round_mode) { auto z = stack.pop_int(); auto y = stack.pop_int(); auto x = stack.pop_int(); - td::BigIntG<257 * 2> tmp{0}; + typename td::BigInt256::DoubleInt tmp{0}, q; tmp.add_mul(*x, *y); - td::BigIntG<257 * 2> q; tmp.mod_div(*z, q, round_mode); - auto r = td::RefInt256{true, tmp}; - stack.push_int(std::move(r)); + stack.push_int(td::make_refint(tmp)); } void interpret_negate(vm::Stack& stack) { @@ -245,21 +250,21 @@ void interpret_fits(vm::Stack& stack, bool sgnd) { void interpret_pow2(vm::Stack& stack) { int x = stack.pop_smallint_range(255); - auto r = td::RefInt256{true}; + auto r = td::make_refint(); r.unique_write().set_pow2(x); stack.push_int(r); } void interpret_neg_pow2(vm::Stack& stack) { int x = stack.pop_smallint_range(256); - auto r = td::RefInt256{true}; + auto r = td::make_refint(); r.unique_write().set_pow2(x).negate().normalize(); stack.push_int(r); } void interpret_pow2_minus1(vm::Stack& stack) { int x = stack.pop_smallint_range(256); - auto r = td::RefInt256{true}; + auto r = td::make_refint(); r.unique_write().set_pow2(x).add_tiny(-1).normalize(); stack.push_int(r); } @@ -293,19 +298,18 @@ void interpret_times_rshift(vm::Stack& stack, int round_mode) { int z = stack.pop_smallint_range(256); auto y = stack.pop_int(); auto x = stack.pop_int(); - td::BigIntG<257 * 2> tmp{0}; + typename td::BigInt256::DoubleInt tmp{0}; tmp.add_mul(*x, *y).rshift(z, round_mode).normalize(); - auto q = td::RefInt256{true, tmp}; - stack.push_int(std::move(q)); + stack.push_int(td::make_refint(tmp)); } void interpret_lshift_div(vm::Stack& stack, int round_mode) { int z = stack.pop_smallint_range(256); auto y = stack.pop_int(); auto x = stack.pop_int(); - td::BigIntG<257 * 2> tmp{*x}; + typename td::BigInt256::DoubleInt tmp{*x}; tmp <<= z; - auto q = td::RefInt256{true}; + auto q = td::make_refint(); tmp.mod_div(*y, q.unique_write(), round_mode); q.unique_write().normalize(); stack.push_int(std::move(q)); @@ -596,6 +600,12 @@ void interpret_str_split(vm::Stack& stack) { stack.push_string(std::string{str, sz}); } +void interpret_str_pos(vm::Stack& stack) { + auto s2 = stack.pop_string(), s1 = stack.pop_string(); + auto pos = s1.find(s2); + stack.push_smallint(pos == std::string::npos ? -1 : pos); +} + void interpret_str_reverse(vm::Stack& stack) { std::string s = stack.pop_string(); auto it = s.begin(); @@ -651,6 +661,20 @@ void interpret_utf8_str_split(vm::Stack& stack) { } } +void interpret_utf8_str_pos(vm::Stack& stack) { + auto s2 = stack.pop_string(), s1 = stack.pop_string(); + auto pos = s1.find(s2); + if (pos == std::string::npos) { + stack.push_smallint(-1); + return; + } + int cnt = 0; + for (std::size_t i = 0; i < pos; i++) { + cnt += ((s1[i] & 0xc0) != 0x80); + } + stack.push_smallint(cnt); +} + void interpret_str_remove_trailing_int(vm::Stack& stack, int arg) { char x = (char)(arg ? arg : stack.pop_long_range(127)); std::string s = stack.pop_string(); @@ -979,8 +1003,8 @@ void interpret_store_end(vm::Stack& stack, bool special) { void interpret_from_cell(vm::Stack& stack) { auto cell = stack.pop_cell(); - Ref cs{true}; - if (!cs.unique_write().load(vm::NoVmOrd(), std::move(cell))) { + Ref cs{true, vm::NoVmOrd(), std::move(cell)}; + if (!cs->is_valid()) { throw IntError{"deserializing a special cell as ordinary"}; } stack.push(cs); @@ -1089,7 +1113,10 @@ void interpret_fetch_ref(vm::Stack& stack, int mode) { stack.push(std::move(cs)); } if (mode & 1) { - Ref new_cs{true, vm::NoVm(), std::move(cell)}; + Ref new_cs{true, vm::NoVmOrd(), std::move(cell)}; + if (!new_cs->is_valid()) { + throw IntError{"cannot load ordinary cell"}; + } stack.push(std::move(new_cs)); } else { stack.push_cell(std::move(cell)); @@ -1484,11 +1511,12 @@ void interpret_store_dict(vm::Stack& stack) { } // val key dict keylen -- dict' ? -void interpret_dict_add_u(vm::Stack& stack, vm::Dictionary::SetMode mode, bool add_builder, bool sgnd) { +void interpret_dict_add(vm::Stack& stack, vm::Dictionary::SetMode mode, bool add_builder, int sgnd) { int n = stack.pop_smallint_range(vm::Dictionary::max_key_bits); vm::Dictionary dict{stack.pop_maybe_cell(), n}; unsigned char buffer[vm::Dictionary::max_key_bytes]; - vm::BitSlice key = dict.integer_key(stack.pop_int(), n, sgnd, buffer); + vm::BitSlice key = + (sgnd >= 0) ? dict.integer_key(stack.pop_int(), n, sgnd, buffer) : stack.pop_cellslice()->prefetch_bits(n); if (!key.is_valid()) { throw IntError{"not enough bits for a dictionary key"}; } @@ -1502,81 +1530,91 @@ void interpret_dict_add_u(vm::Stack& stack, vm::Dictionary::SetMode mode, bool a stack.push_bool(res); } -void interpret_dict_get_u(vm::Stack& stack, bool sgnd) { +void interpret_dict_get(vm::Stack& stack, int sgnd, int mode) { int n = stack.pop_smallint_range(vm::Dictionary::max_key_bits); vm::Dictionary dict{stack.pop_maybe_cell(), n}; unsigned char buffer[vm::Dictionary::max_key_bytes]; - vm::BitSlice key = dict.integer_key(stack.pop_int(), n, sgnd, buffer); + vm::BitSlice key = + (sgnd >= 0) ? dict.integer_key(stack.pop_int(), n, sgnd, buffer) : stack.pop_cellslice()->prefetch_bits(n); if (!key.is_valid()) { throw IntError{"not enough bits for a dictionary key"}; } - auto res = dict.lookup(std::move(key)); - if (res.not_null()) { + auto res = (mode & 4 ? dict.lookup_delete(std::move(key)) : dict.lookup(std::move(key))); + if (mode & 4) { + stack.push_maybe_cell(std::move(dict).extract_root_cell()); + } + bool found = res.not_null(); + if (found && (mode & 2)) { stack.push_cellslice(std::move(res)); - stack.push_bool(true); - } else { - stack.push_bool(false); + } + if (mode & 1) { + stack.push_bool(found); } } -void interpret_dict_map(IntCtx& ctx) { +void interpret_dict_map(IntCtx& ctx, bool ext, bool sgnd) { auto func = pop_exec_token(ctx); int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits); - vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n}; - vm::Dictionary::simple_map_func_t simple_map = [&ctx, func](vm::CellBuilder& cb, Ref cs_ref) -> bool { - ctx.stack.push_builder(Ref(cb)); - ctx.stack.push_cellslice(std::move(cs_ref)); - func->run(ctx); - assert(cb.is_unique()); - if (!ctx.stack.pop_bool()) { - return false; + vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n}, dict2{n}; + for (auto entry : dict.range(false, sgnd)) { + ctx.stack.push_builder(Ref{true}); + if (ext) { + ctx.stack.push_int(dict.key_as_integer(entry.first, sgnd)); + } + ctx.stack.push_cellslice(std::move(entry.second)); + func->run(ctx); + if (ctx.stack.pop_bool()) { + if (!dict2.set_builder(entry.first, n, ctx.stack.pop_builder())) { + throw IntError{"cannot insert value into dictionary"}; + } } - Ref cb_ref = ctx.stack.pop_builder(); - cb = *cb_ref; - return true; }; - dict.map(std::move(simple_map)); - ctx.stack.push_maybe_cell(std::move(dict).extract_root_cell()); + ctx.stack.push_maybe_cell(std::move(dict2).extract_root_cell()); } -void interpret_dict_map_ext(IntCtx& ctx) { +void interpret_dict_foreach(IntCtx& ctx, bool reverse, bool sgnd) { auto func = pop_exec_token(ctx); int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits); vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n}; - vm::Dictionary::map_func_t map_func = [&ctx, func](vm::CellBuilder& cb, Ref cs_ref, - td::ConstBitPtr key, int key_len) -> bool { - ctx.stack.push_builder(Ref(cb)); - td::RefInt256 x{true}; - x.unique_write().import_bits(key, key_len, false); - ctx.stack.push_int(std::move(x)); - ctx.stack.push_cellslice(std::move(cs_ref)); + for (auto entry : dict.range(reverse, sgnd)) { + ctx.stack.push_int(dict.key_as_integer(entry.first, sgnd)); + ctx.stack.push_cellslice(std::move(entry.second)); func->run(ctx); - assert(cb.is_unique()); if (!ctx.stack.pop_bool()) { - return false; + ctx.stack.push_bool(false); + return; } - Ref cb_ref = ctx.stack.pop_builder(); - cb = *cb_ref; - return true; }; - dict.map(std::move(map_func)); - ctx.stack.push_maybe_cell(std::move(dict).extract_root_cell()); + ctx.stack.push_bool(true); } -void interpret_dict_foreach(IntCtx& ctx) { +// mode: +1 = reverse, +2 = signed, +4 = strict, +8 = lookup backwards, +16 = with hint +void interpret_dict_foreach_from(IntCtx& ctx, int mode) { + if (mode < 0) { + mode = ctx.stack.pop_smallint_range(31); + } auto func = pop_exec_token(ctx); int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits); vm::Dictionary dict{ctx.stack.pop_maybe_cell(), n}; - vm::Dictionary::foreach_func_t foreach_func = [&ctx, func](Ref cs_ref, td::ConstBitPtr key, - int key_len) -> bool { - td::RefInt256 x{true}; - x.unique_write().import_bits(key, key_len, false); - ctx.stack.push_int(std::move(x)); - ctx.stack.push_cellslice(std::move(cs_ref)); + vm::DictIterator it{dict, mode & 3}; + unsigned char buffer[vm::Dictionary::max_key_bytes]; + for (int s = (mode >> 4) & 1; s >= 0; --s) { + auto key = dict.integer_key(ctx.stack.pop_int(), n, mode & 2, buffer); + if (!key.is_valid()) { + throw IntError{"not enough bits for a dictionary key"}; + } + it.lookup(key, mode & 4, mode & 8); + } + for (; !it.eof(); ++it) { + ctx.stack.push_int(dict.key_as_integer(it.cur_pos(), mode & 2)); + ctx.stack.push_cellslice(it.cur_value()); func->run(ctx); - return ctx.stack.pop_bool(); + if (!ctx.stack.pop_bool()) { + ctx.stack.push_bool(false); + return; + } }; - ctx.stack.push_bool(dict.check_for_each(std::move(foreach_func))); + ctx.stack.push_bool(true); } void interpret_dict_merge(IntCtx& ctx) { @@ -1584,24 +1622,33 @@ void interpret_dict_merge(IntCtx& ctx) { int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits); vm::Dictionary dict2{ctx.stack.pop_maybe_cell(), n}; vm::Dictionary dict1{ctx.stack.pop_maybe_cell(), n}; - vm::Dictionary::simple_combine_func_t simple_combine = [&ctx, func](vm::CellBuilder& cb, Ref cs1_ref, - Ref cs2_ref) -> bool { - ctx.stack.push_builder(Ref(cb)); - ctx.stack.push_cellslice(std::move(cs1_ref)); - ctx.stack.push_cellslice(std::move(cs2_ref)); - func->run(ctx); - assert(cb.is_unique()); - if (!ctx.stack.pop_bool()) { - return false; + vm::Dictionary dict3{n}; + auto it1 = dict1.begin(), it2 = dict2.begin(); + while (!it1.eof() || !it2.eof()) { + int c = it1.eof() ? 1 : (it2.eof() ? -1 : it1.cur_pos().compare(it2.cur_pos(), n)); + bool ok = true; + if (c < 0) { + ok = dict3.set(it1.cur_pos(), n, it1.cur_value()); + ++it1; + } else if (c > 0) { + ok = dict3.set(it2.cur_pos(), n, it2.cur_value()); + ++it2; + } else { + ctx.stack.push_builder(Ref{true}); + ctx.stack.push_cellslice(it1.cur_value()); + ctx.stack.push_cellslice(it2.cur_value()); + func->run(ctx); + if (ctx.stack.pop_bool()) { + ok = dict3.set_builder(it1.cur_pos(), n, ctx.stack.pop_builder()); + } + ++it1; + ++it2; + } + if (!ok) { + throw IntError{"cannot insert value into dictionary"}; } - Ref cb_ref = ctx.stack.pop_builder(); - cb = *cb_ref; - return true; - }; - if (!dict1.combine_with(dict2, std::move(simple_combine))) { - throw IntError{"cannot combine dictionaries"}; } - ctx.stack.push_maybe_cell(std::move(dict1).extract_root_cell()); + ctx.stack.push_maybe_cell(std::move(dict3).extract_root_cell()); } void interpret_dict_diff(IntCtx& ctx) { @@ -1609,17 +1656,40 @@ void interpret_dict_diff(IntCtx& ctx) { int n = ctx.stack.pop_smallint_range(vm::Dictionary::max_key_bits); vm::Dictionary dict2{ctx.stack.pop_maybe_cell(), n}; vm::Dictionary dict1{ctx.stack.pop_maybe_cell(), n}; - vm::Dictionary::scan_diff_func_t scan_value_pair = - [&ctx, func](td::ConstBitPtr key, int key_len, Ref cs1_ref, Ref cs2_ref) -> bool { - td::RefInt256 x{true}; - x.unique_write().import_bits(key, key_len, false); - ctx.stack.push_int(std::move(x)); - ctx.stack.push_maybe_cellslice(std::move(cs1_ref)); - ctx.stack.push_maybe_cellslice(std::move(cs2_ref)); - func->run(ctx); - return ctx.stack.pop_bool(); - }; - ctx.stack.push_bool(dict1.scan_diff(dict2, std::move(scan_value_pair))); + auto it1 = dict1.begin(), it2 = dict2.begin(); + while (!it1.eof() || !it2.eof()) { + int c = it1.eof() ? 1 : (it2.eof() ? -1 : it1.cur_pos().compare(it2.cur_pos(), n)); + bool run = true; + if (c < 0) { + ctx.stack.push_int(dict1.key_as_integer(it1.cur_pos())); + ctx.stack.push_cellslice(it1.cur_value()); + ctx.stack.push_null(); + ++it1; + } else if (c > 0) { + ctx.stack.push_int(dict2.key_as_integer(it2.cur_pos())); + ctx.stack.push_null(); + ctx.stack.push_cellslice(it2.cur_value()); + ++it2; + } else { + if (!it1.cur_value()->contents_equal(*it2.cur_value())) { + ctx.stack.push_int(dict1.key_as_integer(it1.cur_pos())); + ctx.stack.push_cellslice(it1.cur_value()); + ctx.stack.push_cellslice(it2.cur_value()); + } else { + run = false; + } + ++it1; + ++it2; + } + if (run) { + func->run(ctx); + if (!ctx.stack.pop_bool()) { + ctx.stack.push_bool(false); + return; + } + } + } + ctx.stack.push_bool(true); } void interpret_pfx_dict_add(vm::Stack& stack, vm::Dictionary::SetMode mode, bool add_builder) { @@ -1858,7 +1928,7 @@ int parse_number(std::string s, td::RefInt256& num, td::RefInt256& denom, bool a const char* str = s.c_str(); int len = (int)s.size(); int frac = -1, base, *frac_ptr = allow_frac ? &frac : nullptr; - num = td::RefInt256{true}; + num = td::make_refint(); auto& x = num.unique_write(); if (len >= 4 && str[0] == '-' && str[1] == '0' && (str[2] == 'x' || str[2] == 'b')) { if (str[2] == 'x') { @@ -1900,7 +1970,7 @@ int parse_number(std::string s, td::RefInt256& num, td::RefInt256& denom, bool a if (frac < 0) { return 1; } else { - denom = td::RefInt256{true, 1}; + denom = td::make_refint(1); while (frac-- > 0) { if (!denom.unique_write().mul_tiny(base).normalize_bool()) { if (throw_error) { @@ -2141,6 +2211,7 @@ class StringLogger : public td::LogInterface { } std::string res; }; + class OstreamLogger : public td::LogInterface { public: explicit OstreamLogger(std::ostream* stream) : stream_(stream) { @@ -2163,59 +2234,42 @@ std::vector> get_vm_libraries() { } } -void interpret_run_vm_code(IntCtx& ctx, bool with_gas) { - long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty; - auto cs = ctx.stack.pop_cellslice(); - OstreamLogger ostream_logger(ctx.error_stream); - auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr); - vm::GasLimits gas{gas_limit}; - int res = vm::run_vm_code(cs, ctx.stack, 0, nullptr, log, nullptr, &gas, get_vm_libraries()); - ctx.stack.push_smallint(res); - if (with_gas) { - ctx.stack.push_smallint(gas.gas_consumed()); +// mode: -1 = pop from stack +// +1 = same_c3 (set c3 to code) +// +2 = push_0 (push an implicit 0 before running the code) +// +4 = load c4 (persistent data) from stack and return its final value +// +8 = load gas limit from stack and return consumed gas +// +16 = load c7 (smart-contract context) +// +32 = return c5 (actions) +// +64 = log vm ops to stderr +void interpret_run_vm(IntCtx& ctx, int mode) { + if (mode < 0) { + mode = ctx.stack.pop_smallint_range(0xff); } -} - -void interpret_run_vm_dict(IntCtx& ctx, bool with_gas) { - long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty; - auto cs = ctx.stack.pop_cellslice(); - OstreamLogger ostream_logger(ctx.error_stream); - auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr); - vm::GasLimits gas{gas_limit}; - int res = vm::run_vm_code(cs, ctx.stack, 3, nullptr, log, nullptr, &gas, get_vm_libraries()); - ctx.stack.push_smallint(res); - if (with_gas) { - ctx.stack.push_smallint(gas.gas_consumed()); + bool with_data = mode & 4; + Ref c7; + Ref data, actions; + long long gas_limit = (mode & 8) ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty; + if (mode & 16) { + c7 = ctx.stack.pop_tuple(); } -} - -void interpret_run_vm(IntCtx& ctx, bool with_gas) { - long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty; - auto data = ctx.stack.pop_cell(); - auto cs = ctx.stack.pop_cellslice(); - OstreamLogger ostream_logger(ctx.error_stream); - auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr); - vm::GasLimits gas{gas_limit}; - int res = vm::run_vm_code(cs, ctx.stack, 1, &data, log, nullptr, &gas, get_vm_libraries()); - ctx.stack.push_smallint(res); - ctx.stack.push_cell(std::move(data)); - if (with_gas) { - ctx.stack.push_smallint(gas.gas_consumed()); + if (with_data) { + data = ctx.stack.pop_cell(); } -} - -void interpret_run_vm_c7(IntCtx& ctx, bool with_gas) { - long long gas_limit = with_gas ? ctx.stack.pop_long_range(vm::GasLimits::infty) : vm::GasLimits::infty; - auto c7 = ctx.stack.pop_tuple(); - auto data = ctx.stack.pop_cell(); auto cs = ctx.stack.pop_cellslice(); OstreamLogger ostream_logger(ctx.error_stream); - auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr); + auto log = create_vm_log((mode & 64) && ctx.error_stream ? &ostream_logger : nullptr); vm::GasLimits gas{gas_limit}; - int res = vm::run_vm_code(cs, ctx.stack, 1, &data, log, nullptr, &gas, get_vm_libraries(), std::move(c7)); + int res = + vm::run_vm_code(cs, ctx.stack, mode & 3, &data, log, nullptr, &gas, get_vm_libraries(), std::move(c7), &actions); ctx.stack.push_smallint(res); - ctx.stack.push_cell(std::move(data)); - if (with_gas) { + if (with_data) { + ctx.stack.push_cell(std::move(data)); + } + if (mode & 32) { + ctx.stack.push_cell(std::move(actions)); + } + if (mode & 8) { ctx.stack.push_smallint(gas.gas_consumed()); } } @@ -2328,12 +2382,57 @@ void interpret_db_run_vm_parallel(IntCtx& ctx) { do_interpret_db_run_vm_parallel(ctx.error_stream, ctx.stack, ctx.ton_db, threads_n, tasks_n); } +void interpret_store_vm_cont(vm::Stack& stack) { + auto vmcont = stack.pop_cont(); + auto cb = stack.pop_builder(); + if (!vmcont->serialize(cb.write())) { + throw IntError{"cannot serialize vm continuation"}; + } + stack.push_builder(std::move(cb)); +} + +void interpret_fetch_vm_cont(vm::Stack& stack) { + auto cs = stack.pop_cellslice(); + auto vmcont = vm::Continuation::deserialize(cs.write()); + if (vmcont.is_null()) { + throw IntError{"cannot deserialize vm continuation"}; + } + stack.push_cellslice(std::move(cs)); + stack.push_cont(std::move(vmcont)); +} + +Ref cmdline_args{true}; + +void interpret_get_fixed_cmdline_arg(vm::Stack& stack, int n) { + if (!n) { + return; + } + auto v = cmdline_args->get(); + while (true) { + if (v.empty()) { + stack.push(vm::StackEntry{}); + return; + } + auto t = v.as_tuple_range(2, 2); + if (t.is_null()) { + throw IntError{"invalid cmdline arg list"}; + } + if (!--n) { + stack.push(t->at(0)); + return; + } + v = t->at(1); + } +} + // n -- executes $n void interpret_get_cmdline_arg(IntCtx& ctx) { int n = ctx.stack.pop_smallint_range(999999); - char buffer[14]; - sprintf(buffer, "$%d ", n); - auto entry = ctx.dictionary->lookup(std::string{buffer}); + if (n) { + interpret_get_fixed_cmdline_arg(ctx.stack, n); + return; + } + auto entry = ctx.dictionary->lookup("$0 "); if (!entry) { throw IntError{"-?"}; } else { @@ -2341,6 +2440,19 @@ void interpret_get_cmdline_arg(IntCtx& ctx) { } } +void interpret_get_cmdline_arg_count(vm::Stack& stack) { + auto v = cmdline_args->get(); + int cnt; + for (cnt = 0; !v.empty(); cnt++) { + auto t = v.as_tuple_range(2, 2); + if (t.is_null()) { + throw IntError{"invalid cmdline arg list"}; + } + v = t->at(1); + } + stack.push_smallint(cnt); +} + void interpret_getenv(vm::Stack& stack) { auto str = stack.pop_string(); auto value = str.size() < 1024 ? getenv(str.c_str()) : nullptr; @@ -2434,10 +2546,12 @@ void init_words_common(Dictionary& d) { d.def_ctx_word("csr. ", interpret_dot_cellslice_rec); d.def_ctx_word(".s ", interpret_dotstack); d.def_ctx_word(".sl ", interpret_dotstack_list); + d.def_ctx_word(".sL ", interpret_dotstack_list_dump); // TMP d.def_ctx_word(".dump ", interpret_dump); d.def_ctx_word(".l ", interpret_print_list); d.def_ctx_word(".tc ", interpret_dottc); d.def_stack_word("(dump) ", interpret_dump_internal); + d.def_stack_word("(ldump) ", interpret_list_dump_internal); d.def_stack_word("(.) ", interpret_dot_internal); d.def_stack_word("(x.) ", std::bind(interpret_dothex_internal, _1, false)); d.def_stack_word("(X.) ", std::bind(interpret_dothex_internal, _1, true)); @@ -2558,6 +2672,7 @@ void init_words_common(Dictionary& d) { d.def_stack_word("$= ", interpret_str_equal); d.def_stack_word("$cmp ", interpret_str_cmp); d.def_stack_word("$reverse ", interpret_str_reverse); + d.def_stack_word("$pos ", interpret_str_pos); d.def_stack_word("(-trailing) ", std::bind(interpret_str_remove_trailing_int, _1, 0)); d.def_stack_word("-trailing ", std::bind(interpret_str_remove_trailing_int, _1, ' ')); d.def_stack_word("-trailing0 ", std::bind(interpret_str_remove_trailing_int, _1, '0')); @@ -2565,6 +2680,7 @@ void init_words_common(Dictionary& d) { d.def_stack_word("Blen ", interpret_bytes_len); d.def_stack_word("$Len ", interpret_utf8_str_len); d.def_stack_word("$Split ", interpret_utf8_str_split); + d.def_stack_word("$Pos ", interpret_utf8_str_pos); d.def_ctx_word("Bx. ", std::bind(interpret_bytes_hex_print_raw, _1, true)); d.def_stack_word("B>X ", std::bind(interpret_bytes_to_hex, _1, true)); d.def_stack_word("B>x ", std::bind(interpret_bytes_to_hex, _1, false)); @@ -2669,22 +2785,38 @@ void init_words_common(Dictionary& d) { d.def_stack_word("dict, ", interpret_store_dict); d.def_stack_word("dict@ ", std::bind(interpret_load_dict, _1, false)); d.def_stack_word("dict@+ ", std::bind(interpret_load_dict, _1, true)); - d.def_stack_word("udict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, false, false)); - d.def_stack_word("udict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, false, false)); - d.def_stack_word("b>udict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, true, false)); - d.def_stack_word("b>udict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, true, false)); - d.def_stack_word("udict@ ", std::bind(interpret_dict_get_u, _1, false)); - d.def_stack_word("idict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, false, true)); - d.def_stack_word("idict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, false, true)); - d.def_stack_word("b>idict!+ ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Add, true, true)); - d.def_stack_word("b>idict! ", std::bind(interpret_dict_add_u, _1, vm::Dictionary::SetMode::Set, true, true)); - d.def_stack_word("idict@ ", std::bind(interpret_dict_get_u, _1, true)); + d.def_stack_word("sdict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, false, -1)); + d.def_stack_word("sdict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, false, -1)); + d.def_stack_word("b>sdict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, true, -1)); + d.def_stack_word("b>sdict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, true, -1)); + d.def_stack_word("sdict@ ", std::bind(interpret_dict_get, _1, -1, 3)); + d.def_stack_word("sdict@- ", std::bind(interpret_dict_get, _1, -1, 7)); + d.def_stack_word("sdict- ", std::bind(interpret_dict_get, _1, -1, 5)); + d.def_stack_word("udict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, false, 0)); + d.def_stack_word("udict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, false, 0)); + d.def_stack_word("b>udict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, true, 0)); + d.def_stack_word("b>udict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, true, 0)); + d.def_stack_word("udict@ ", std::bind(interpret_dict_get, _1, 0, 3)); + d.def_stack_word("udict@- ", std::bind(interpret_dict_get, _1, 0, 7)); + d.def_stack_word("udict- ", std::bind(interpret_dict_get, _1, 0, 5)); + d.def_stack_word("idict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, false, 1)); + d.def_stack_word("idict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, false, 1)); + d.def_stack_word("b>idict!+ ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Add, true, 1)); + d.def_stack_word("b>idict! ", std::bind(interpret_dict_add, _1, vm::Dictionary::SetMode::Set, true, 1)); + d.def_stack_word("idict@ ", std::bind(interpret_dict_get, _1, 1, 3)); + d.def_stack_word("idict@- ", std::bind(interpret_dict_get, _1, 1, 7)); + d.def_stack_word("idict- ", std::bind(interpret_dict_get, _1, 1, 5)); d.def_stack_word("pfxdict!+ ", std::bind(interpret_pfx_dict_add, _1, vm::Dictionary::SetMode::Add, false)); d.def_stack_word("pfxdict! ", std::bind(interpret_pfx_dict_add, _1, vm::Dictionary::SetMode::Set, false)); d.def_stack_word("pfxdict@ ", interpret_pfx_dict_get); - d.def_ctx_word("dictmap ", interpret_dict_map); - d.def_ctx_word("dictmapext ", interpret_dict_map_ext); - d.def_ctx_word("dictforeach ", interpret_dict_foreach); + d.def_ctx_word("dictmap ", std::bind(interpret_dict_map, _1, false, false)); + d.def_ctx_word("dictmapext ", std::bind(interpret_dict_map, _1, true, false)); + d.def_ctx_word("idictmapext ", std::bind(interpret_dict_map, _1, true, true)); + d.def_ctx_word("dictforeach ", std::bind(interpret_dict_foreach, _1, false, false)); + d.def_ctx_word("idictforeach ", std::bind(interpret_dict_foreach, _1, false, true)); + d.def_ctx_word("dictforeachrev ", std::bind(interpret_dict_foreach, _1, true, false)); + d.def_ctx_word("idictforeachrev ", std::bind(interpret_dict_foreach, _1, true, true)); + d.def_ctx_word("dictforeachfromx ", std::bind(interpret_dict_foreach_from, _1, -1)); d.def_ctx_word("dictmerge ", interpret_dict_merge); d.def_ctx_word("dictdiff ", interpret_dict_diff); // slice/bitstring constants @@ -2756,6 +2888,10 @@ void init_words_common(Dictionary& d) { d.def_ctx_word("quit ", interpret_quit); d.def_ctx_word("bye ", interpret_bye); d.def_stack_word("halt ", interpret_halt); + // cmdline args + d.def_stack_word("$* ", std::bind(interpret_literal, _1, vm::StackEntry{cmdline_args})); + d.def_stack_word("$# ", interpret_get_cmdline_arg_count); + d.def_ctx_word("$() ", interpret_get_cmdline_arg); } void init_words_ton(Dictionary& d) { @@ -2768,34 +2904,34 @@ void init_words_ton(Dictionary& d) { d.def_stack_word("base64url>B ", std::bind(interpret_base64_to_bytes, _1, true, false)); } -void init_words_vm(Dictionary& d) { +void init_words_vm(Dictionary& d, bool enable_debug) { using namespace std::placeholders; - vm::init_op_cp0(); + vm::init_op_cp0(enable_debug); // vm run d.def_stack_word("vmlibs ", std::bind(interpret_literal, _1, vm::StackEntry{vm_libraries})); - d.def_ctx_word("runvmcode ", std::bind(interpret_run_vm_code, _1, false)); - d.def_ctx_word("gasrunvmcode ", std::bind(interpret_run_vm_code, _1, true)); - d.def_ctx_word("runvmdict ", std::bind(interpret_run_vm_dict, _1, false)); - d.def_ctx_word("gasrunvmdict ", std::bind(interpret_run_vm_dict, _1, true)); - d.def_ctx_word("runvm ", std::bind(interpret_run_vm, _1, false)); - d.def_ctx_word("gasrunvm ", std::bind(interpret_run_vm, _1, true)); - d.def_ctx_word("runvmctx ", std::bind(interpret_run_vm_c7, _1, false)); - d.def_ctx_word("gasrunvmctx ", std::bind(interpret_run_vm_c7, _1, true)); + // d.def_ctx_word("runvmcode ", std::bind(interpret_run_vm, _1, 0x40)); + // d.def_ctx_word("runvm ", std::bind(interpret_run_vm, _1, 0x45)); + d.def_ctx_word("runvmx ", std::bind(interpret_run_vm, _1, -1)); d.def_ctx_word("dbrunvm ", interpret_db_run_vm); d.def_ctx_word("dbrunvm-parallel ", interpret_db_run_vm_parallel); + d.def_stack_word("vmcont, ", interpret_store_vm_cont); + d.def_stack_word("vmcont@ ", interpret_fetch_vm_cont); } void import_cmdline_args(Dictionary& d, std::string arg0, int n, const char* const argv[]) { using namespace std::placeholders; LOG(DEBUG) << "import_cmdlist_args(" << arg0 << "," << n << ")"; d.def_stack_word("$0 ", std::bind(interpret_literal, _1, vm::StackEntry{arg0})); - for (int i = 0; i < n; i++) { - char buffer[14]; - sprintf(buffer, "$%d ", i + 1); - d.def_stack_word(buffer, std::bind(interpret_literal, _1, vm::StackEntry{argv[i]})); + vm::StackEntry list; + for (int i = n - 1; i >= 0; i--) { + list = vm::StackEntry::cons(vm::StackEntry{argv[i]}, list); + } + cmdline_args->set(std::move(list)); + for (int i = 1; i <= n; i++) { + char buffer[14]; + sprintf(buffer, "$%d ", i); + d.def_stack_word(buffer, std::bind(interpret_get_fixed_cmdline_arg, _1, i)); } - d.def_stack_word("$# ", std::bind(interpret_const, _1, n)); - d.def_ctx_word("$() ", interpret_get_cmdline_arg); } std::pair numeric_value_ext(std::string s, bool allow_frac = true) { diff --git a/submodules/ton/tonlib-src/crypto/fift/words.h b/submodules/ton/tonlib-src/crypto/fift/words.h index eac182e43b..de5b438930 100644 --- a/submodules/ton/tonlib-src/crypto/fift/words.h +++ b/submodules/ton/tonlib-src/crypto/fift/words.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "Dictionary.h" @@ -33,7 +33,7 @@ struct Quit { struct SkipToEof {}; void init_words_common(Dictionary& dictionary); -void init_words_vm(Dictionary& dictionary); +void init_words_vm(Dictionary& dictionary, bool debug_enabled = false); void init_words_ton(Dictionary& dictionary); void import_cmdline_args(Dictionary& d, std::string arg0, int n, const char* const argv[]); diff --git a/submodules/ton/tonlib-src/crypto/func/abscode.cpp b/submodules/ton/tonlib-src/crypto/func/abscode.cpp index 8ff204f13c..8d73c80540 100644 --- a/submodules/ton/tonlib-src/crypto/func/abscode.cpp +++ b/submodules/ton/tonlib-src/crypto/func/abscode.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -138,7 +138,7 @@ void VarDescr::show(std::ostream& os, const char* name) const { } void VarDescr::set_const(long long value) { - return set_const(td::RefInt256{true, value}); + return set_const(td::make_refint(value)); } void VarDescr::set_const(td::RefInt256 value) { @@ -169,7 +169,7 @@ void VarDescr::set_const(td::RefInt256 value) { } void VarDescr::set_const_nan() { - set_const(td::RefInt256{true}); + set_const(td::make_refint()); } void VarDescr::operator|=(const VarDescr& y) { @@ -323,6 +323,20 @@ void Op::show(std::ostream& os, const std::vector& vars, std::string pfx show_var_list(os, right, vars); os << std::endl; break; + case _Tuple: + os << pfx << dis << "MKTUPLE "; + show_var_list(os, left, vars); + os << " := "; + show_var_list(os, right, vars); + os << std::endl; + break; + case _UnTuple: + os << pfx << dis << "UNTUPLE "; + show_var_list(os, left, vars); + os << " := "; + show_var_list(os, right, vars); + os << std::endl; + break; case _IntConst: os << pfx << dis << "CONST "; show_var_list(os, left, vars); @@ -343,6 +357,12 @@ void Op::show(std::ostream& os, const std::vector& vars, std::string pfx show_var_list(os, left, vars); os << " := " << (fun_ref ? fun_ref->name() : "(null)") << std::endl; break; + case _SetGlob: + os << pfx << dis << "SETGLOB "; + os << (fun_ref ? fun_ref->name() : "(null)") << " := "; + show_var_list(os, right, vars); + os << std::endl; + break; case _Repeat: os << pfx << dis << "REPEAT "; show_var_list(os, left, vars); diff --git a/submodules/ton/tonlib-src/crypto/func/analyzer.cpp b/submodules/ton/tonlib-src/crypto/func/analyzer.cpp index a80bc74e23..5af435bc8e 100644 --- a/submodules/ton/tonlib-src/crypto/func/analyzer.cpp +++ b/submodules/ton/tonlib-src/crypto/func/analyzer.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -29,6 +29,7 @@ namespace funC { void CodeBlob::simplify_var_types() { for (TmpVar& var : vars) { TypeExpr::remove_indirect(var.v_type); + var.v_type->recompute_width(); } } @@ -354,7 +355,9 @@ bool Op::compute_used_vars(const CodeBlob& code, bool edit) { case _IntConst: case _GlobVar: case _Call: - case _CallInd: { + case _CallInd: + case _Tuple: + case _UnTuple: { // left = EXEC right; if (!next_var_info.count_used(left) && is_pure()) { // all variables in `left` are not needed @@ -365,6 +368,13 @@ bool Op::compute_used_vars(const CodeBlob& code, bool edit) { } return std_compute_used_vars(); } + case _SetGlob: { + // GLOB = right + if (right.empty() && edit) { + disable(); + } + return std_compute_used_vars(right.empty()); + } case _Let: { // left = right std::size_t cnt = next_var_info.count_used(left); @@ -431,26 +441,25 @@ bool Op::compute_used_vars(const CodeBlob& code, bool edit) { } case _While: { // while (block0 || left) block1; - // ... { block0 left block1 } block0 left next - VarDescrList after_cond_first{next_var_info}; - after_cond_first += left; - code.compute_used_code_vars(block0, after_cond_first, false); - VarDescrList new_var_info{block0->var_info}; + // ... block0 left { block1 block0 left } next + VarDescrList new_var_info{next_var_info}; bool changes = false; do { - code.compute_used_code_vars(block1, block0->var_info, changes); - VarDescrList after_cond{block1->var_info}; + VarDescrList after_cond{new_var_info}; after_cond += left; code.compute_used_code_vars(block0, after_cond, changes); + code.compute_used_code_vars(block1, block0->var_info, changes); std::size_t n = new_var_info.size(); - new_var_info += block0->var_info; + new_var_info += block1->var_info; new_var_info.clear_last(); if (changes) { break; } changes = (new_var_info.size() == n); } while (changes <= edit); - return set_var_info(std::move(new_var_info)); + new_var_info += left; + code.compute_used_code_vars(block0, new_var_info, edit); + return set_var_info(block0->var_info); } case _Until: { // until (block0 || left); @@ -532,8 +541,11 @@ bool prune_unreachable(std::unique_ptr& ops) { switch (op.cl) { case Op::_IntConst: case Op::_GlobVar: + case Op::_SetGlob: case Op::_Call: case Op::_CallInd: + case Op::_Tuple: + case Op::_UnTuple: case Op::_Import: reach = true; break; @@ -695,7 +707,6 @@ VarDescrList Op::fwd_analyze(VarDescrList values) { values.add_newval(left[0]).set_const(int_const); break; } - case _GlobVar: case _Call: { prepare_args(values); auto func = dynamic_cast(fun_ref->value); @@ -718,12 +729,17 @@ VarDescrList Op::fwd_analyze(VarDescrList values) { } break; } + case _Tuple: + case _UnTuple: + case _GlobVar: case _CallInd: { for (var_idx_t i : left) { values.add_newval(i); } break; } + case _SetGlob: + break; case _Let: { std::vector old_val; assert(left.size() == right.size()); @@ -833,6 +849,9 @@ bool Op::mark_noreturn() { case _Import: case _IntConst: case _Let: + case _Tuple: + case _UnTuple: + case _SetGlob: case _GlobVar: case _CallInd: case _Call: diff --git a/submodules/ton/tonlib-src/crypto/func/asmops.cpp b/submodules/ton/tonlib-src/crypto/func/asmops.cpp index df4443a4d2..cb0fff1be1 100644 --- a/submodules/ton/tonlib-src/crypto/func/asmops.cpp +++ b/submodules/ton/tonlib-src/crypto/func/asmops.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "parser/srcread.h" #include "func.h" @@ -121,12 +121,49 @@ AsmOp AsmOp::BlkDrop(int a) { return AsmOp::Custom(os.str(), a, 0); } +AsmOp AsmOp::BlkDrop2(int a, int b) { + if (!b) { + return BlkDrop(a); + } + std::ostringstream os; + os << a << " " << b << " BLKDROP2"; + return AsmOp::Custom(os.str(), a + b, b); +} + AsmOp AsmOp::BlkReverse(int a, int b) { std::ostringstream os; os << a << " " << b << " REVERSE"; return AsmOp::Custom(os.str(), a + b, a + b); } +AsmOp AsmOp::Tuple(int a) { + switch (a) { + case 1: + return AsmOp::Custom("SINGLE", 1, 1); + case 2: + return AsmOp::Custom("PAIR", 2, 1); + case 3: + return AsmOp::Custom("TRIPLE", 3, 1); + } + std::ostringstream os; + os << a << " TUPLE"; + return AsmOp::Custom(os.str(), a, 1); +} + +AsmOp AsmOp::UnTuple(int a) { + switch (a) { + case 1: + return AsmOp::Custom("UNSINGLE", 1, 1); + case 2: + return AsmOp::Custom("UNPAIR", 1, 2); + case 3: + return AsmOp::Custom("UNTRIPLE", 1, 3); + } + std::ostringstream os; + os << a << " UNTUPLE"; + return AsmOp::Custom(os.str(), 1, a); +} + AsmOp AsmOp::IntConst(td::RefInt256 x) { if (x->signed_fits_bits(8)) { return AsmOp::Const(dec_string(std::move(x)) + " PUSHINT"); @@ -325,6 +362,8 @@ bool apply_op(StackTransform& trans, const AsmOp& op) { return trans.apply_pop(op.a); case AsmOp::a_const: return !op.a && op.b == 1 && trans.apply_push_newconst(); + case AsmOp::a_custom: + return op.is_gconst() && trans.apply_push_newconst(); default: return false; } diff --git a/submodules/ton/tonlib-src/crypto/func/builtins.cpp b/submodules/ton/tonlib-src/crypto/func/builtins.cpp index dd156f24c6..066da4602f 100644 --- a/submodules/ton/tonlib-src/crypto/func/builtins.cpp +++ b/submodules/ton/tonlib-src/crypto/func/builtins.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -27,8 +27,8 @@ using namespace std::literals::string_literals; * */ -int glob_func_cnt, undef_func_cnt; -std::vector glob_func; +int glob_func_cnt, undef_func_cnt, glob_var_cnt; +std::vector glob_func, glob_vars; SymDef* predefine_builtin_func(std::string name, TypeExpr* func_type) { sym_idx_t name_idx = sym::symbols.lookup(name, 1); @@ -44,30 +44,49 @@ SymDef* predefine_builtin_func(std::string name, TypeExpr* func_type) { } template -void define_builtin_func(std::string name, TypeExpr* func_type, const T& func, bool impure = false) { +SymDef* define_builtin_func(std::string name, TypeExpr* func_type, const T& func, bool impure = false) { SymDef* def = predefine_builtin_func(name, func_type); def->value = new SymValAsmFunc{func_type, func, impure}; + return def; } template -void define_builtin_func(std::string name, TypeExpr* func_type, const T& func, std::initializer_list arg_order, - std::initializer_list ret_order = {}, bool impure = false) { +SymDef* define_builtin_func(std::string name, TypeExpr* func_type, const T& func, std::initializer_list arg_order, + std::initializer_list ret_order = {}, bool impure = false) { SymDef* def = predefine_builtin_func(name, func_type); def->value = new SymValAsmFunc{func_type, func, arg_order, ret_order, impure}; + return def; } -void define_builtin_func(std::string name, TypeExpr* func_type, const AsmOp& macro, - std::initializer_list arg_order, std::initializer_list ret_order = {}, - bool impure = false) { +SymDef* define_builtin_func(std::string name, TypeExpr* func_type, const AsmOp& macro, + std::initializer_list arg_order, std::initializer_list ret_order = {}, + bool impure = false) { SymDef* def = predefine_builtin_func(name, func_type); def->value = new SymValAsmFunc{func_type, make_simple_compile(macro), arg_order, ret_order, impure}; + return def; } -bool SymValAsmFunc::compile(AsmOpList& dest, std::vector& in, std::vector& out) const { +SymDef* force_autoapply(SymDef* def) { + if (def) { + auto val = dynamic_cast(def->value); + if (val) { + val->auto_apply = true; + } + } + return def; +} + +template +SymDef* define_builtin_const(std::string name, TypeExpr* const_type, Args&&... args) { + return force_autoapply( + define_builtin_func(name, TypeExpr::new_map(TypeExpr::new_unit(), const_type), std::forward(args)...)); +} + +bool SymValAsmFunc::compile(AsmOpList& dest, std::vector& out, std::vector& in) const { if (simple_compile) { - return dest.append(simple_compile(in, out)); + return dest.append(simple_compile(out, in)); } else if (ext_compile) { - return ext_compile(dest, in, out); + return ext_compile(dest, out, in); } else { return false; } @@ -317,6 +336,12 @@ AsmOp exec_arg_op(std::string op, td::RefInt256 arg, int args, int retv) { return AsmOp::Custom(os.str(), args, retv); } +AsmOp exec_arg2_op(std::string op, long long imm1, long long imm2, int args, int retv) { + std::ostringstream os; + os << imm1 << ' ' << imm2 << ' ' << op; + return AsmOp::Custom(os.str(), args, retv); +} + AsmOp push_const(td::RefInt256 x) { return AsmOp::IntConst(std::move(x)); } @@ -603,7 +628,7 @@ AsmOp compile_mod(std::vector& res, std::vector& args, int r if ((*y.int_const == 1 || *y.int_const == -1) && x.always_finite()) { x.unused(); y.unused(); - r.set_const(td::RefInt256{true, 0}); + r.set_const(td::zero_refint()); return push_const(r.int_const); } int k = is_pos_pow2(y.int_const); @@ -740,7 +765,7 @@ AsmOp compile_cond_throw(std::vector& res, std::vector& args x.unused(); return skip_cond ? exec_arg_op("THROW", x.int_const, 0, 0) : exec_arg_op("THROW"s + suff, x.int_const, 1, 0); } else { - return skip_cond ? exec_op("THROWANY", 1, 0) : exec_arg_op("THROWANY"s + suff, 2, 0); + return skip_cond ? exec_op("THROWANY", 1, 0) : exec_op("THROWANY"s + suff, 2, 0); } } @@ -918,11 +943,11 @@ void define_builtins() { define_builtin_func("_<=_", arith_bin_op, std::bind(compile_cmp_int, _1, _2, 6)); define_builtin_func("_>=_", arith_bin_op, std::bind(compile_cmp_int, _1, _2, 3)); define_builtin_func("_<=>_", arith_bin_op, std::bind(compile_cmp_int, _1, _2, 7)); - define_builtin_func("true", Int, /* AsmOp::Const("TRUE") */ std::bind(compile_bool_const, _1, _2, true)); - define_builtin_func("false", Int, /* AsmOp::Const("FALSE") */ std::bind(compile_bool_const, _1, _2, false)); + define_builtin_const("true", Int, /* AsmOp::Const("TRUE") */ std::bind(compile_bool_const, _1, _2, true)); + define_builtin_const("false", Int, /* AsmOp::Const("FALSE") */ std::bind(compile_bool_const, _1, _2, false)); // define_builtin_func("null", Null, AsmOp::Const("PUSHNULL")); - define_builtin_func("nil", Tuple, AsmOp::Const("PUSHNULL")); - define_builtin_func("Nil", Tuple, AsmOp::Const("NIL")); + define_builtin_const("nil", Tuple, AsmOp::Const("PUSHNULL")); + define_builtin_const("Nil", Tuple, AsmOp::Const("NIL")); define_builtin_func("null?", TypeExpr::new_forall({X}, TypeExpr::new_map(X, Int)), compile_is_null); define_builtin_func("throw", impure_un_op, compile_throw, true); define_builtin_func("throw_if", impure_bin_op, std::bind(compile_cond_throw, _1, _2, true), true); @@ -949,7 +974,7 @@ void define_builtins() { define_builtin_func("~touch2", TypeExpr::new_forall({X, Y}, TypeExpr::new_map(XY, TypeExpr::new_tensor({XY, Unit}))), AsmOp::Nop()); define_builtin_func("~dump", TypeExpr::new_forall({X}, TypeExpr::new_map(X, TypeExpr::new_tensor({X, Unit}))), - AsmOp::Custom("s0 DUMP", 1, 1)); + AsmOp::Custom("s0 DUMP", 1, 1), true); define_builtin_func("run_method0", TypeExpr::new_map(Int, Unit), [](auto a, auto b, auto c) { return compile_run_method(a, b, c, 0, false); }, true); define_builtin_func("run_method1", TypeExpr::new_forall({X}, TypeExpr::new_map(TypeExpr::new_tensor({Int, X}), Unit)), diff --git a/submodules/ton/tonlib-src/crypto/func/codegen.cpp b/submodules/ton/tonlib-src/crypto/func/codegen.cpp index 70ae929df3..26d8215ea3 100644 --- a/submodules/ton/tonlib-src/crypto/func/codegen.cpp +++ b/submodules/ton/tonlib-src/crypto/func/codegen.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -84,7 +84,9 @@ void Stack::forget_const() { void Stack::issue_pop(int i) { validate(i); - o << AsmOp::Pop(i); + if (output_enabled()) { + o << AsmOp::Pop(i); + } at(i) = get(0); s.pop_back(); modified(); @@ -92,7 +94,9 @@ void Stack::issue_pop(int i) { void Stack::issue_push(int i) { validate(i); - o << AsmOp::Push(i); + if (output_enabled()) { + o << AsmOp::Push(i); + } s.push_back(get(i)); modified(); } @@ -101,7 +105,9 @@ void Stack::issue_xchg(int i, int j) { validate(i); validate(j); if (i != j && get(i) != get(j)) { - o << AsmOp::Xchg(i, j); + if (output_enabled()) { + o << AsmOp::Xchg(i, j); + } std::swap(at(i), at(j)); modified(); } @@ -183,6 +189,10 @@ void Stack::enforce_state(const StackLayout& req_stack) { if (i < depth() && s[i].first == x) { continue; } + while (depth() > 0 && std::find(req_stack.cbegin(), req_stack.cend(), get(0).first) == req_stack.cend()) { + // current TOS entry is unused in req_stack, drop it + issue_pop(0); + } int j = find(x); if (j >= depth() - i) { issue_push(j); @@ -292,27 +302,61 @@ bool Op::generate_code_step(Stack& stack) { } return true; } - case _GlobVar: { - assert(left.size() == 1); - auto p = next_var_info[left[0]]; - if (!p || p->is_unused() || disabled()) { + case _GlobVar: + if (dynamic_cast(fun_ref->value)) { + bool used = false; + for (auto i : left) { + auto p = next_var_info[i]; + if (p && !p->is_unused()) { + used = true; + } + } + if (!used || disabled()) { + return true; + } + std::string name = sym::symbols.get_name(fun_ref->sym_idx); + stack.o << AsmOp::Custom(name + " GETGLOB", 0, 1); + if (left.size() != 1) { + assert(left.size() <= 15); + stack.o << AsmOp::UnTuple((int)left.size()); + } + for (auto i : left) { + stack.push_new_var(i); + } + return true; + } else { + assert(left.size() == 1); + auto p = next_var_info[left[0]]; + if (!p || p->is_unused() || disabled()) { + return true; + } + stack.o << "CONT:<{"; + stack.o.indent(); + auto func = dynamic_cast(fun_ref->value); + if (func) { + // TODO: create and compile a true lambda instead of this (so that arg_order and ret_order would work correctly) + std::vector args0, res; + TypeExpr::remove_indirect(func->sym_type); + assert(func->get_type()->is_map()); + auto wr = func->get_type()->args.at(0)->get_width(); + auto wl = func->get_type()->args.at(1)->get_width(); + assert(wl >= 0 && wr >= 0); + for (int i = 0; i < wl; i++) { + res.emplace_back(0); + } + for (int i = 0; i < wr; i++) { + args0.emplace_back(0); + } + func->compile(stack.o, res, args0); // compile res := f (args0) + } else { + std::string name = sym::symbols.get_name(fun_ref->sym_idx); + stack.o << AsmOp::Custom(name + " CALLDICT", (int)right.size(), (int)left.size()); + } + stack.o.undent(); + stack.o << "}>"; + stack.push_new_var(left.at(0)); return true; } - auto func = dynamic_cast(fun_ref->value); - if (func) { - std::vector res; - res.reserve(left.size()); - for (var_idx_t i : left) { - res.emplace_back(i); - } - func->compile(stack.o, res, args); // compile res := f (args) - } else { - std::string name = sym::symbols.get_name(fun_ref->sym_idx); - stack.o << AsmOp::Custom(name + " CALLDICT", (int)right.size(), (int)left.size()); - } - stack.push_new_var(left[0]); - return true; - } case _Let: { assert(left.size() == right.size()); int i = 0; @@ -352,6 +396,32 @@ bool Op::generate_code_step(Stack& stack) { } return true; } + case _Tuple: + case _UnTuple: { + if (disabled()) { + return true; + } + std::vector last; + for (var_idx_t x : right) { + last.push_back(var_info[x] && var_info[x]->is_last()); + } + stack.rearrange_top(right, std::move(last)); + stack.opt_show(); + int k = (int)stack.depth() - (int)right.size(); + assert(k >= 0); + if (cl == _Tuple) { + stack.o << AsmOp::Tuple((int)right.size()); + assert(left.size() == 1); + } else { + stack.o << AsmOp::UnTuple((int)left.size()); + assert(right.size() == 1); + } + stack.s.resize(k); + for (int i = 0; i < (int)left.size(); i++) { + stack.push_new_var(left.at(i)); + } + return true; + } case _Call: case _CallInd: { if (disabled()) { @@ -395,7 +465,9 @@ bool Op::generate_code_step(Stack& stack) { assert(stack.s[k + i].first == right1[i]); } if (cl == _CallInd) { - stack.o << exec_arg_op("CALLARGS", (int)right.size() - 1, (int)right.size(), (int)left.size()); + // TODO: replace with exec_arg2_op() + stack.o << exec_arg2_op("CALLXARGS", (int)right.size() - 1, (int)left.size(), (int)right.size(), + (int)left.size()); } else { auto func = dynamic_cast(fun_ref->value); if (func) { @@ -420,6 +492,32 @@ bool Op::generate_code_step(Stack& stack) { } return true; } + case _SetGlob: { + assert(fun_ref && dynamic_cast(fun_ref->value)); + std::vector last; + for (var_idx_t x : right) { + last.push_back(var_info[x] && var_info[x]->is_last()); + } + stack.rearrange_top(right, std::move(last)); + stack.opt_show(); + int k = (int)stack.depth() - (int)right.size(); + assert(k >= 0); + for (int i = 0; i < (int)right.size(); i++) { + if (stack.s[k + i].first != right[i]) { + std::cerr << stack.o; + } + assert(stack.s[k + i].first == right[i]); + } + if (right.size() > 1) { + stack.o << AsmOp::Tuple((int)right.size()); + } + if (!right.empty()) { + std::string name = sym::symbols.get_name(fun_ref->sym_idx); + stack.o << AsmOp::Custom(name + " SETGLOB", 1, 0); + } + stack.s.resize(k); + return true; + } case _If: { if (block0->is_empty() && block1->is_empty()) { return true; @@ -448,7 +546,9 @@ bool Op::generate_code_step(Stack& stack) { } stack.o << "IF:<{"; stack.o.indent(); - Stack stack_copy{stack}; + Stack stack_copy{stack}, stack_target{stack}; + stack_target.disable_output(); + stack_target.drop_vars_except(next->var_info); block0->generate_code_all(stack_copy); stack_copy.drop_vars_except(var_info); stack_copy.opt_show(); @@ -457,7 +557,8 @@ bool Op::generate_code_step(Stack& stack) { stack.o << "}>"; return true; } - stack_copy.drop_vars_except(next->var_info); + // stack_copy.drop_vars_except(next->var_info); + stack_copy.enforce_state(stack_target.vars()); stack_copy.opt_show(); if (stack_copy.vars() == stack.vars()) { stack.o.undent(); @@ -487,7 +588,9 @@ bool Op::generate_code_step(Stack& stack) { } stack.o << "IFNOT:<{"; stack.o.indent(); - Stack stack_copy{stack}; + Stack stack_copy{stack}, stack_target{stack}; + stack_target.disable_output(); + stack_target.drop_vars_except(next->var_info); block1->generate_code_all(stack_copy); stack_copy.drop_vars_except(var_info); stack_copy.opt_show(); @@ -497,7 +600,8 @@ bool Op::generate_code_step(Stack& stack) { stack.merge_const(stack_copy); return true; } - stack_copy.drop_vars_except(next->var_info); + // stack_copy.drop_vars_except(next->var_info); + stack_copy.enforce_state(stack_target.vars()); stack_copy.opt_show(); if (stack_copy.vars() == stack.vars()) { stack.o.undent(); diff --git a/submodules/ton/tonlib-src/crypto/func/func.cpp b/submodules/ton/tonlib-src/crypto/func/func.cpp index 2b98c332bd..5b937c8331 100644 --- a/submodules/ton/tonlib-src/crypto/func/func.cpp +++ b/submodules/ton/tonlib-src/crypto/func/func.cpp @@ -130,6 +130,11 @@ int generate_output() { *outs << func_val->method_id << " DECLMETHOD " << name << "\n"; } } + for (SymDef* gvar_sym : glob_vars) { + assert(dynamic_cast(gvar_sym->value)); + std::string name = sym::symbols.get_name(gvar_sym->sym_idx); + *outs << std::string(indent * 2, ' ') << "DECLGLOBVAR " << name << "\n"; + } int errors = 0; for (SymDef* func_sym : glob_func) { try { diff --git a/submodules/ton/tonlib-src/crypto/func/func.h b/submodules/ton/tonlib-src/crypto/func/func.h index d1481299b8..fd2bffd63d 100644 --- a/submodules/ton/tonlib-src/crypto/func/func.h +++ b/submodules/ton/tonlib-src/crypto/func/func.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include @@ -36,7 +36,7 @@ namespace funC { extern int verbosity; extern bool op_rewrite_comments; -constexpr int optimize_depth = 12; +constexpr int optimize_depth = 20; enum Keyword { _Eof = -1, @@ -97,9 +97,11 @@ enum Keyword { _Forall, _Asm, _Impure, + _Global, _Extern, _Inline, _InlineRef, + _AutoApply, _MethodId, _Operator, _Infix, @@ -133,7 +135,7 @@ class IdSc { */ struct TypeExpr { - enum te_type { te_Unknown, te_Var, te_Indirect, te_Atomic, te_Tensor, te_Map, te_Type, te_ForAll } constr; + enum te_type { te_Unknown, te_Var, te_Indirect, te_Atomic, te_Tensor, te_Tuple, te_Map, te_Type, te_ForAll } constr; enum { _Int = Keyword::_Int, _Cell = Keyword::_Cell, @@ -159,6 +161,9 @@ struct TypeExpr { : constr(_constr), value((int)list.size()), args(std::move(list)) { compute_width(); } + TypeExpr(te_type _constr, TypeExpr* elem0) : constr(_constr), value(1), args{elem0} { + compute_width(); + } TypeExpr(te_type _constr, TypeExpr* elem0, std::vector list) : constr(_constr), value((int)list.size() + 1), args{elem0} { args.insert(args.end(), list.begin(), list.end()); @@ -181,6 +186,12 @@ struct TypeExpr { bool is_var() const { return constr == te_Var; } + bool is_map() const { + return constr == te_Map; + } + bool is_tuple() const { + return constr == te_Tuple; + } bool has_fixed_width() const { return minw == maxw; } @@ -222,6 +233,15 @@ struct TypeExpr { static TypeExpr* new_tensor(TypeExpr* te1, TypeExpr* te2, TypeExpr* te3) { return new_tensor({te1, te2, te3}); } + static TypeExpr* new_tuple(TypeExpr* arg0) { + return new TypeExpr{te_Tuple, arg0}; + } + static TypeExpr* new_tuple(std::vector list, bool red = false) { + return new_tuple(new_tensor(std::move(list), red)); + } + static TypeExpr* new_tuple(std::initializer_list list) { + return new_tuple(new_tensor(std::move(list))); + } static TypeExpr* new_var() { return new TypeExpr{te_Var, --type_vars, 1}; } @@ -498,8 +518,11 @@ struct Op { _Let, _IntConst, _GlobVar, + _SetGlob, _Import, _Return, + _Tuple, + _UnTuple, _If, _While, _Until, @@ -694,6 +717,7 @@ struct SymVal : sym::SymValBase { TypeExpr* sym_type; td::RefInt256 method_id; bool impure; + bool auto_apply{false}; short flags; // +1 = inline, +2 = inline_ref SymVal(int _type, int _idx, TypeExpr* _stype = nullptr, bool _impure = false) : sym::SymValBase(_type, _idx), sym_type(_stype), impure(_impure), flags(0) { @@ -745,8 +769,20 @@ struct SymValType : sym::SymValBase { } }; -extern int glob_func_cnt, undef_func_cnt; -extern std::vector glob_func; +struct SymValGlobVar : sym::SymValBase { + TypeExpr* sym_type; + int out_idx{0}; + SymValGlobVar(int val, TypeExpr* gvtype, int oidx = 0) + : sym::SymValBase(_GlobVar, val), sym_type(gvtype), out_idx(oidx) { + } + ~SymValGlobVar() override = default; + TypeExpr* get_type() const { + return sym_type; + } +}; + +extern int glob_func_cnt, undef_func_cnt, glob_var_cnt; +extern std::vector glob_func, glob_vars; /* * @@ -771,10 +807,12 @@ struct Expr { _Apply, _VarApply, _TypeApply, - _Tuple, + _MkTuple, + _Tensor, _Const, _Var, _Glob, + _GlobVar, _Letop, _LetFirst, _Hole, @@ -824,6 +862,12 @@ struct Expr { bool is_type() const { return flags & _IsType; } + bool is_type_apply() const { + return cls == _TypeApply; + } + bool is_mktuple() const { + return cls == _MkTuple; + } void chk_rvalue(const Lexem& lem) const; void chk_lvalue(const Lexem& lem) const; void chk_type(const Lexem& lem) const; @@ -836,7 +880,8 @@ struct Expr { } int define_new_vars(CodeBlob& code); int predefine_vars(); - std::vector pre_compile(CodeBlob& code) const; + std::vector pre_compile(CodeBlob& code, bool lval = false) const; + static std::vector pre_compile_let(CodeBlob& code, Expr* lhs, Expr* rhs, const SrcLocation& here); var_idx_t new_tmp(CodeBlob& code) const; std::vector new_tmp_vect(CodeBlob& code) const { return {new_tmp(code)}; @@ -860,6 +905,7 @@ struct AsmOp { int t{a_none}; int indent{0}; int a, b, c; + bool gconst{false}; std::string op; struct SReg { int idx; @@ -878,6 +924,7 @@ struct AsmOp { AsmOp(int _t, int _a, int _b) : t(_t), a(_a), b(_b) { } AsmOp(int _t, int _a, int _b, std::string _op) : t(_t), a(_a), b(_b), op(std::move(_op)) { + compute_gconst(); } AsmOp(int _t, int _a, int _b, int _c) : t(_t), a(_a), b(_b), c(_c) { } @@ -886,6 +933,9 @@ struct AsmOp { void out(std::ostream& os) const; void out_indent_nl(std::ostream& os, bool no_nl = false) const; std::string to_string() const; + void compute_gconst() { + gconst = (is_custom() && (op == "PUSHNULL" || op == "NEWC" || op == "NEWB" || op == "TRUE" || op == "FALSE")); + } bool is_nop() const { return t == a_none && op.empty(); } @@ -925,6 +975,9 @@ struct AsmOp { *y = b; return is_xchg(); } + bool is_xchg_short() const { + return is_xchg() && (a <= 1 || b <= 1); + } bool is_swap() const { return is_xchg(0, 1); } @@ -932,7 +985,7 @@ struct AsmOp { return t == a_const && !a && b == 1; } bool is_gconst() const { - return (t == a_const || t == a_custom) && !a && b == 1; + return !a && b == 1 && (t == a_const || gconst); } static AsmOp Nop() { return AsmOp(a_none); @@ -985,6 +1038,7 @@ struct AsmOp { static AsmOp BlkSwap(int a, int b); static AsmOp BlkPush(int a, int b); static AsmOp BlkDrop(int a); + static AsmOp BlkDrop2(int a, int b); static AsmOp BlkReverse(int a, int b); static AsmOp make_stk2(int a, int b, const char* str, int delta); static AsmOp make_stk3(int a, int b, int c, const char* str, int delta); @@ -1005,6 +1059,8 @@ struct AsmOp { return AsmOp(a_custom, args, retv, custom_op); } static AsmOp Parse(std::string custom_op, int args, int retv = 1); + static AsmOp Tuple(int a); + static AsmOp UnTuple(int a); }; inline std::ostream& operator<<(std::ostream& os, const AsmOp& op) { @@ -1155,6 +1211,7 @@ struct StackTransform { bool apply_push(int i); bool apply_pop(int i = 0); bool apply_push_newconst(); + bool apply_blkpop(int k); bool apply(const StackTransform& other); // this = this * other bool preapply(const StackTransform& other); // this = other * this // c := a * b @@ -1211,12 +1268,22 @@ struct StackTransform { } bool is_xchg(int i, int j) const; bool is_xchg(int* i, int* j) const; + bool is_xchg_xchg(int i, int j, int k, int l) const; + bool is_xchg_xchg(int* i, int* j, int* k, int* l) const; bool is_push(int i) const; bool is_push(int* i) const; bool is_pop(int i) const; bool is_pop(int* i) const; + bool is_pop_pop(int i, int j) const; + bool is_pop_pop(int* i, int* j) const; bool is_rot() const; bool is_rotrev() const; + bool is_push_rot(int i) const; + bool is_push_rot(int* i) const; + bool is_push_rotrev(int i) const; + bool is_push_rotrev(int* i) const; + bool is_push_xchg(int i, int j, int k) const; + bool is_push_xchg(int* i, int* j, int* k) const; bool is_xchg2(int i, int j) const; bool is_xchg2(int* i, int* j) const; bool is_xcpu(int i, int j) const; @@ -1241,11 +1308,23 @@ struct StackTransform { bool is_blkpush(int i, int j) const; bool is_blkpush(int* i, int* j) const; bool is_blkdrop(int* i) const; + bool is_blkdrop2(int i, int j) const; + bool is_blkdrop2(int* i, int* j) const; bool is_reverse(int i, int j) const; bool is_reverse(int* i, int* j) const; bool is_nip_seq(int i, int j = 0) const; bool is_nip_seq(int* i) const; bool is_nip_seq(int* i, int* j) const; + bool is_pop_blkdrop(int i, int k) const; + bool is_pop_blkdrop(int* i, int* k) const; + bool is_2pop_blkdrop(int i, int j, int k) const; + bool is_2pop_blkdrop(int* i, int* j, int* k) const; + bool is_const_rot(int c) const; + bool is_const_rot(int* c) const; + bool is_const_pop(int c, int i) const; + bool is_const_pop(int* c, int* i) const; + bool is_push_const(int i, int c) const; + bool is_push_const(int* i, int* c) const; void show(std::ostream& os, int mode = 0) const; @@ -1282,11 +1361,12 @@ struct Optimizer { AsmOpCons* op_cons_[n]; int offs_[n]; StackTransform tr_[n]; + int mode_{0}; Optimizer() { } - Optimizer(bool debug) : debug_(debug) { + Optimizer(bool debug, int mode = 0) : debug_(debug), mode_(mode) { } - Optimizer(AsmOpConsList code, bool debug = false) : Optimizer(debug) { + Optimizer(AsmOpConsList code, bool debug = false, int mode = 0) : Optimizer(debug, mode) { set_code(std::move(code)); } void set_code(AsmOpConsList code_); @@ -1302,19 +1382,28 @@ struct Optimizer { void show_head() const; void show_left() const; void show_right() const; - bool is_const_push_swap() const; - bool rewrite_const_push_swap(); + bool find_const_op(int* op_idx, int cst); + bool is_push_const(int* i, int* c) const; + bool rewrite_push_const(int i, int c); bool is_const_push_xchgs(); bool rewrite_const_push_xchgs(); - bool simple_rewrite(int p, AsmOp&& new_op); - bool simple_rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2); - bool simple_rewrite(AsmOp&& new_op) { - return simple_rewrite(p_, std::move(new_op)); + bool is_const_rot(int* c) const; + bool rewrite_const_rot(int c); + bool is_const_pop(int* c, int* i) const; + bool rewrite_const_pop(int c, int i); + bool rewrite(int p, AsmOp&& new_op); + bool rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2); + bool rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2, AsmOp&& new_op3); + bool rewrite(AsmOp&& new_op) { + return rewrite(p_, std::move(new_op)); } - bool simple_rewrite(AsmOp&& new_op1, AsmOp&& new_op2) { - return simple_rewrite(p_, std::move(new_op1), std::move(new_op2)); + bool rewrite(AsmOp&& new_op1, AsmOp&& new_op2) { + return rewrite(p_, std::move(new_op1), std::move(new_op2)); } - bool simple_rewrite_nop(); + bool rewrite(AsmOp&& new_op1, AsmOp&& new_op2, AsmOp&& new_op3) { + return rewrite(p_, std::move(new_op1), std::move(new_op2), std::move(new_op3)); + } + bool rewrite_nop(); bool is_pred(const std::function& pred, int min_p = 2); bool is_same_as(const StackTransform& trans, int min_p = 2); bool is_rot(); @@ -1325,9 +1414,14 @@ struct Optimizer { bool is_2swap(); bool is_2over(); bool is_xchg(int* i, int* j); + bool is_xchg_xchg(int* i, int* j, int* k, int* l); bool is_push(int* i); bool is_pop(int* i); + bool is_pop_pop(int* i, int* j); bool is_nop(); + bool is_push_rot(int* i); + bool is_push_rotrev(int* i); + bool is_push_xchg(int* i, int* j, int* k); bool is_xchg2(int* i, int* j); bool is_xcpu(int* i, int* j); bool is_puxc(int* i, int* j); @@ -1343,19 +1437,22 @@ struct Optimizer { bool is_blkswap(int* i, int* j); bool is_blkpush(int* i, int* j); bool is_blkdrop(int* i); + bool is_blkdrop2(int* i, int* j); bool is_reverse(int* i, int* j); bool is_nip_seq(int* i, int* j); + bool is_pop_blkdrop(int* i, int* k); + bool is_2pop_blkdrop(int* i, int* j, int* k); AsmOpConsList extract_code(); }; -AsmOpConsList optimize_code_head(AsmOpConsList op_list); -AsmOpConsList optimize_code(AsmOpConsList op_list); +AsmOpConsList optimize_code_head(AsmOpConsList op_list, int mode = 0); +AsmOpConsList optimize_code(AsmOpConsList op_list, int mode); void optimize_code(AsmOpList& ops); struct Stack { StackLayoutExt s; AsmOpList& o; - enum { _StkCmt = 1, _CptStkCmt = 2, _DisableOpt = 4, _Shown = 256, _Garbage = -0x10000 }; + enum { _StkCmt = 1, _CptStkCmt = 2, _DisableOpt = 4, _DisableOut = 128, _Shown = 256, _Garbage = -0x10000 }; int mode; Stack(AsmOpList& _o, int _mode = 0) : o(_o), mode(_mode) { } @@ -1381,6 +1478,15 @@ struct Stack { var_const_idx_t get(int i) const { return at(i); } + bool output_disabled() const { + return mode & _DisableOut; + } + bool output_enabled() const { + return !output_disabled(); + } + void disable_output() { + mode |= _DisableOut; + } StackLayout vars() const; int find(var_idx_t var, int from = 0) const; int find(var_idx_t var, int from, int to) const; @@ -1470,7 +1576,7 @@ struct SymValAsmFunc : SymValFunc { std::initializer_list ret_order = {}, bool impure = false) : SymValFunc(-1, ft, arg_order, ret_order, impure), ext_compile(std::move(_compile)) { } - bool compile(AsmOpList& dest, std::vector& in, std::vector& out) const; + bool compile(AsmOpList& dest, std::vector& out, std::vector& in) const; }; // defined in builtins.cpp @@ -1478,6 +1584,7 @@ AsmOp exec_arg_op(std::string op, long long arg); AsmOp exec_arg_op(std::string op, long long arg, int args, int retv = 1); AsmOp exec_arg_op(std::string op, td::RefInt256 arg); AsmOp exec_arg_op(std::string op, td::RefInt256 arg, int args, int retv = 1); +AsmOp exec_arg2_op(std::string op, long long imm1, long long imm2, int args, int retv = 1); AsmOp push_const(td::RefInt256 x); void define_builtins(); diff --git a/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp b/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp index a3cc52042d..c0a8985a64 100644 --- a/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp +++ b/submodules/ton/tonlib-src/crypto/func/gen-abscode.cpp @@ -14,10 +14,12 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" +using namespace std::literals::string_literals; + namespace funC { /* @@ -164,7 +166,8 @@ bool Expr::deduce_type(const Lexem& lem) { int Expr::define_new_vars(CodeBlob& code) { switch (cls) { - case _Tuple: + case _Tensor: + case _MkTuple: case _TypeApply: { int res = 0; for (const auto& x : args) { @@ -189,7 +192,8 @@ int Expr::define_new_vars(CodeBlob& code) { int Expr::predefine_vars() { switch (cls) { - case _Tuple: + case _Tensor: + case _MkTuple: case _TypeApply: { int res = 0; for (const auto& x : args) { @@ -201,6 +205,7 @@ int Expr::predefine_vars() { if (!sym) { assert(val < 0 && here.defined()); sym = sym::define_symbol(~val, false, here); + // std::cerr << "predefining variable " << sym::symbols.get_name(~val) << std::endl; if (!sym) { throw src::ParseError{here, std::string{"redefined variable `"} + sym::symbols.get_name(~val) + "`"}; } @@ -216,12 +221,51 @@ var_idx_t Expr::new_tmp(CodeBlob& code) const { return code.create_tmp_var(e_type, &here); } -std::vector Expr::pre_compile(CodeBlob& code) const { +std::vector Expr::pre_compile_let(CodeBlob& code, Expr* lhs, Expr* rhs, const SrcLocation& here) { + while (lhs->is_type_apply()) { + lhs = lhs->args.at(0); + } + while (rhs->is_type_apply()) { + rhs = rhs->args.at(0); + } + if (lhs->is_mktuple()) { + if (rhs->is_mktuple()) { + return pre_compile_let(code, lhs->args.at(0), rhs->args.at(0), here); + } + auto right = rhs->pre_compile(code); + TypeExpr::remove_indirect(rhs->e_type); + auto unpacked_type = rhs->e_type->args.at(0); + std::vector tmp{code.create_tmp_var(unpacked_type, &rhs->here)}; + code.emplace_back(lhs->here, Op::_UnTuple, tmp, std::move(right)); + auto tvar = new Expr{_Var}; + tvar->set_val(tmp[0]); + tvar->set_location(rhs->here); + tvar->e_type = unpacked_type; + pre_compile_let(code, lhs->args.at(0), tvar, here); + return tmp; + } + auto right = rhs->pre_compile(code); + if (lhs->cls == Expr::_GlobVar) { + assert(lhs->sym); + auto& op = code.emplace_back(here, Op::_SetGlob, std::vector{}, right, lhs->sym); + op.flags |= Op::_Impure; + } else { + auto left = lhs->pre_compile(code, true); + code.emplace_back(here, Op::_Let, std::move(left), right); + } + return right; +} + +std::vector Expr::pre_compile(CodeBlob& code, bool lval) const { + if (lval && !(cls == _Tensor || cls == _Var || cls == _Hole || cls == _TypeApply)) { + std::cerr << "lvalue expression constructor is " << cls << std::endl; + throw src::Fatal{"cannot compile lvalue expression with unknown constructor"}; + } switch (cls) { - case _Tuple: { + case _Tensor: { std::vector res; for (const auto& x : args) { - auto add = x->pre_compile(code); + auto add = x->pre_compile(code, lval); res.insert(res.end(), add.cbegin(), add.cend()); } return res; @@ -253,7 +297,7 @@ std::vector Expr::pre_compile(CodeBlob& code) const { return rvect; } case _TypeApply: - return args[0]->pre_compile(code); + return args[0]->pre_compile(code, lval); case _Var: case _Hole: return {val}; @@ -282,25 +326,29 @@ std::vector Expr::pre_compile(CodeBlob& code) const { code.emplace_back(here, Op::_IntConst, rvect, intval); return rvect; } - case _Glob: { + case _Glob: + case _GlobVar: { auto rvect = new_tmp_vect(code); code.emplace_back(here, Op::_GlobVar, rvect, std::vector{}, sym); return rvect; } case _Letop: { - auto right = args[1]->pre_compile(code); - auto left = args[0]->pre_compile(code); - code.emplace_back(here, Op::_Let, std::move(left), right); - return right; + return pre_compile_let(code, args.at(0), args.at(1), here); } case _LetFirst: { auto rvect = new_tmp_vect(code); auto right = args[1]->pre_compile(code); - auto left = args[0]->pre_compile(code); + auto left = args[0]->pre_compile(code, true); left.push_back(rvect[0]); code.emplace_back(here, Op::_Let, std::move(left), std::move(right)); return rvect; } + case _MkTuple: { + auto left = new_tmp_vect(code); + auto right = args[0]->pre_compile(code); + code.emplace_back(here, Op::_Tuple, left, std::move(right)); + return left; + } case _CondExpr: { auto cond = args[0]->pre_compile(code); assert(cond.size() == 1); diff --git a/submodules/ton/tonlib-src/crypto/func/keywords.cpp b/submodules/ton/tonlib-src/crypto/func/keywords.cpp index c640f4fe71..47975e7fec 100644 --- a/submodules/ton/tonlib-src/crypto/func/keywords.cpp +++ b/submodules/ton/tonlib-src/crypto/func/keywords.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -46,6 +46,8 @@ void define_keywords() { .add_kw_char(';') .add_kw_char('(') .add_kw_char(')') + .add_kw_char('[') + .add_kw_char(']') .add_kw_char('{') .add_kw_char('}') .add_kw_char('=') @@ -113,10 +115,12 @@ void define_keywords() { .add_keyword("forall", Kw::_Forall); sym::symbols.add_keyword("extern", Kw::_Extern) + .add_keyword("global", Kw::_Global) .add_keyword("asm", Kw::_Asm) .add_keyword("impure", Kw::_Impure) .add_keyword("inline", Kw::_Inline) .add_keyword("inline_ref", Kw::_InlineRef) + .add_keyword("auto_apply", Kw::_AutoApply) .add_keyword("method_id", Kw::_MethodId) .add_keyword("operator", Kw::_Operator) .add_keyword("infix", Kw::_Infix) diff --git a/submodules/ton/tonlib-src/crypto/func/optimize.cpp b/submodules/ton/tonlib-src/crypto/func/optimize.cpp index 95b4403c46..85c1fdd300 100644 --- a/submodules/ton/tonlib-src/crypto/func/optimize.cpp +++ b/submodules/ton/tonlib-src/crypto/func/optimize.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -134,18 +134,70 @@ bool Optimizer::say(std::string str) const { return true; } -bool Optimizer::is_const_push_swap() const { - return l_ >= 3 && op_[0]->is_gconst() && op_[1]->is_push() && op_[1]->a >= 1 && op_[2]->is_swap(); +bool Optimizer::find_const_op(int* op_idx, int cst) { + for (int i = 0; i < l2_; i++) { + if (op_[i]->is_gconst() && tr_[i].get(0) == cst) { + *op_idx = i; + return true; + } + } + return false; +} + +bool Optimizer::is_push_const(int* i, int* c) const { + return pb_ >= 3 && pb_ <= l2_ && tr_[pb_ - 1].is_push_const(i, c); } // PUSHCONST c ; PUSH s(i+1) ; SWAP -> PUSH s(i) ; PUSHCONST c -bool Optimizer::rewrite_const_push_swap() { - p_ = 3; +bool Optimizer::rewrite_push_const(int i, int c) { + p_ = pb_; q_ = 2; + int idx = -1; + if (!(p_ >= 2 && find_const_op(&idx, c) && idx < p_)) { + return false; + } show_left(); - oq_[1] = std::move(op_[0]); - oq_[0] = std::move(op_[1]); - (oq_[0]->a)--; + oq_[1] = std::move(op_[idx]); + oq_[0] = std::move(op_[!idx]); + *oq_[0] = AsmOp::Push(i); + show_right(); + return true; +} + +bool Optimizer::is_const_rot(int* c) const { + return pb_ >= 3 && pb_ <= l2_ && tr_[pb_ - 1].is_const_rot(c); +} + +bool Optimizer::rewrite_const_rot(int c) { + p_ = pb_; + q_ = 2; + int idx = -1; + if (!(p_ >= 2 && find_const_op(&idx, c) && idx < p_)) { + return false; + } + show_left(); + oq_[0] = std::move(op_[idx]); + oq_[1] = std::move(op_[!idx]); + *oq_[1] = AsmOp::Custom("ROT", 3, 3); + show_right(); + return true; +} + +bool Optimizer::is_const_pop(int* c, int* i) const { + return pb_ >= 3 && pb_ <= l2_ && tr_[pb_ - 1].is_const_pop(c, i); +} + +bool Optimizer::rewrite_const_pop(int c, int i) { + p_ = pb_; + q_ = 2; + int idx = -1; + if (!(p_ >= 2 && find_const_op(&idx, c) && idx < p_)) { + return false; + } + show_left(); + oq_[0] = std::move(op_[idx]); + oq_[1] = std::move(op_[!idx]); + *oq_[1] = AsmOp::Pop(i); show_right(); return true; } @@ -236,7 +288,7 @@ bool Optimizer::rewrite_const_push_xchgs() { return true; } -bool Optimizer::simple_rewrite(int p, AsmOp&& new_op) { +bool Optimizer::rewrite(int p, AsmOp&& new_op) { assert(p > 0 && p <= l_); p_ = p; q_ = 1; @@ -247,7 +299,7 @@ bool Optimizer::simple_rewrite(int p, AsmOp&& new_op) { return true; } -bool Optimizer::simple_rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2) { +bool Optimizer::rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2) { assert(p > 1 && p <= l_); p_ = p; q_ = 2; @@ -260,7 +312,22 @@ bool Optimizer::simple_rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2) { return true; } -bool Optimizer::simple_rewrite_nop() { +bool Optimizer::rewrite(int p, AsmOp&& new_op1, AsmOp&& new_op2, AsmOp&& new_op3) { + assert(p > 2 && p <= l_); + p_ = p; + q_ = 3; + show_left(); + oq_[0] = std::move(op_[0]); + *oq_[0] = new_op1; + oq_[1] = std::move(op_[1]); + *oq_[1] = new_op2; + oq_[2] = std::move(op_[2]); + *oq_[2] = new_op3; + show_right(); + return true; +} + +bool Optimizer::rewrite_nop() { assert(p_ > 0 && p_ <= l_); q_ = 0; show_left(); @@ -326,6 +393,13 @@ bool Optimizer::is_xchg(int* i, int* j) { return is_pred([i, j](const auto& t) { return t.is_xchg(i, j) && ((*i < 16 && *j < 16) || (!*i && *j < 256)); }); } +bool Optimizer::is_xchg_xchg(int* i, int* j, int* k, int* l) { + return is_pred([i, j, k, l](const auto& t) { + return t.is_xchg_xchg(i, j, k, l) && (*i < 2 && *j < (*i ? 16 : 256) && *k < 2 && *l < (*k ? 16 : 256)); + }) && + (!(p_ == 2 && op_[0]->is_xchg(*i, *j) && op_[1]->is_xchg(*k, *l))); +} + bool Optimizer::is_push(int* i) { return is_pred([i](const auto& t) { return t.is_push(i) && *i < 256; }); } @@ -334,6 +408,23 @@ bool Optimizer::is_pop(int* i) { return is_pred([i](const auto& t) { return t.is_pop(i) && *i < 256; }); } +bool Optimizer::is_pop_pop(int* i, int* j) { + return is_pred([i, j](const auto& t) { return t.is_pop_pop(i, j) && *i < 256 && *j < 256; }, 3); +} + +bool Optimizer::is_push_rot(int* i) { + return is_pred([i](const auto& t) { return t.is_push_rot(i) && *i < 16; }, 3); +} + +bool Optimizer::is_push_rotrev(int* i) { + return is_pred([i](const auto& t) { return t.is_push_rotrev(i) && *i < 16; }, 3); +} + +bool Optimizer::is_push_xchg(int* i, int* j, int* k) { + return is_pred([i, j, k](const auto& t) { return t.is_push_xchg(i, j, k) && *i < 16 && *j < 16 && *k < 16; }) && + !(p_ == 2 && op_[0]->is_push() && op_[1]->is_xchg()); +} + bool Optimizer::is_xchg2(int* i, int* j) { return is_pred([i, j](const auto& t) { return t.is_xchg2(i, j) && *i < 16 && *j < 16; }); } @@ -367,7 +458,8 @@ bool Optimizer::is_xcpu2(int* i, int* j, int* k) { } bool Optimizer::is_puxc2(int* i, int* j, int* k) { - return is_pred([i, j, k](const auto& t) { return t.is_puxc2(i, j, k) && *i < 16 && *j < 15 && *k < 15; }); + return is_pred( + [i, j, k](const auto& t) { return t.is_puxc2(i, j, k) && *i < 16 && *j < 15 && *k < 15 && *j + *k != -1; }); } bool Optimizer::is_puxcpu(int* i, int* j, int* k) { @@ -394,6 +486,10 @@ bool Optimizer::is_blkdrop(int* i) { return is_pred([i](const auto& t) { return t.is_blkdrop(i) && *i > 0 && *i < 16; }); } +bool Optimizer::is_blkdrop2(int* i, int* j) { + return is_pred([i, j](const auto& t) { return t.is_blkdrop2(i, j) && *i > 0 && *i < 16 && *j > 0 && *j < 16; }); +} + bool Optimizer::is_reverse(int* i, int* j) { return is_pred([i, j](const auto& t) { return t.is_reverse(i, j) && *i >= 2 && *i <= 17 && *j < 16; }); } @@ -402,6 +498,16 @@ bool Optimizer::is_nip_seq(int* i, int* j) { return is_pred([i, j](const auto& t) { return t.is_nip_seq(i, j) && *i >= 3 && *i <= 15; }); } +bool Optimizer::is_pop_blkdrop(int* i, int* k) { + return is_pred([i, k](const auto& t) { return t.is_pop_blkdrop(i, k) && *i >= *k && *k >= 2 && *k <= 15; }, 3); +} + +bool Optimizer::is_2pop_blkdrop(int* i, int* j, int* k) { + return is_pred( + [i, j, k](const auto& t) { return t.is_2pop_blkdrop(i, j, k) && *i >= *k && *j >= *k && *k >= 2 && *k <= 15; }, + 3); +} + bool Optimizer::compute_stack_transforms() { StackTransform trans; for (int i = 0; i < l_; i++) { @@ -448,34 +554,41 @@ bool Optimizer::find_at_least(int pb) { p_ = q_ = 0; pb_ = pb; // show_stack_transforms(); - int i = -100, j = -100, k = -100; - return (is_const_push_swap() && 3 >= pb && rewrite_const_push_swap()) || (is_nop() && simple_rewrite_nop()) || - (is_const_push_xchgs() && rewrite_const_push_xchgs()) || - (is_xchg(&i, &j) && simple_rewrite(AsmOp::Xchg(i, j))) || (is_push(&i) && simple_rewrite(AsmOp::Push(i))) || - (is_pop(&i) && simple_rewrite(AsmOp::Pop(i))) || (is_rot() && simple_rewrite(AsmOp::Custom("ROT", 3, 3))) || - (is_rotrev() && simple_rewrite(AsmOp::Custom("-ROT", 3, 3))) || - (is_2dup() && simple_rewrite(AsmOp::Custom("2DUP", 2, 4))) || - (is_2swap() && simple_rewrite(AsmOp::Custom("2SWAP", 2, 4))) || - (is_2over() && simple_rewrite(AsmOp::Custom("2OVER", 2, 4))) || - (is_tuck() && simple_rewrite(AsmOp::Custom("TUCK", 2, 3))) || - (is_2drop() && simple_rewrite(AsmOp::Custom("2DROP", 2, 0))) || - (is_xchg2(&i, &j) && simple_rewrite(AsmOp::Xchg2(i, j))) || - (is_xcpu(&i, &j) && simple_rewrite(AsmOp::XcPu(i, j))) || - (is_puxc(&i, &j) && simple_rewrite(AsmOp::PuXc(i, j))) || - (is_push2(&i, &j) && simple_rewrite(AsmOp::Push2(i, j))) || - (is_blkswap(&i, &j) && simple_rewrite(AsmOp::BlkSwap(i, j))) || - (is_blkpush(&i, &j) && simple_rewrite(AsmOp::BlkPush(i, j))) || - (is_blkdrop(&i) && simple_rewrite(AsmOp::BlkDrop(i))) || - (is_reverse(&i, &j) && simple_rewrite(AsmOp::BlkReverse(i, j))) || - (is_nip_seq(&i, &j) && simple_rewrite(AsmOp::Xchg(i, j), AsmOp::BlkDrop(i))) || - (is_xchg3(&i, &j, &k) && simple_rewrite(AsmOp::Xchg3(i, j, k))) || - (is_xc2pu(&i, &j, &k) && simple_rewrite(AsmOp::Xc2Pu(i, j, k))) || - (is_xcpuxc(&i, &j, &k) && simple_rewrite(AsmOp::XcPuXc(i, j, k))) || - (is_xcpu2(&i, &j, &k) && simple_rewrite(AsmOp::XcPu2(i, j, k))) || - (is_puxc2(&i, &j, &k) && simple_rewrite(AsmOp::PuXc2(i, j, k))) || - (is_puxcpu(&i, &j, &k) && simple_rewrite(AsmOp::PuXcPu(i, j, k))) || - (is_pu2xc(&i, &j, &k) && simple_rewrite(AsmOp::Pu2Xc(i, j, k))) || - (is_push3(&i, &j, &k) && simple_rewrite(AsmOp::Push3(i, j, k))); + int i, j, k, l, c; + return (is_push_const(&i, &c) && rewrite_push_const(i, c)) || (is_nop() && rewrite_nop()) || + (!(mode_ & 1) && is_const_rot(&c) && rewrite_const_rot(c)) || + (is_const_push_xchgs() && rewrite_const_push_xchgs()) || (is_const_pop(&c, &i) && rewrite_const_pop(c, i)) || + (is_xchg(&i, &j) && rewrite(AsmOp::Xchg(i, j))) || (is_push(&i) && rewrite(AsmOp::Push(i))) || + (is_pop(&i) && rewrite(AsmOp::Pop(i))) || (is_pop_pop(&i, &j) && rewrite(AsmOp::Pop(i), AsmOp::Pop(j))) || + (is_xchg_xchg(&i, &j, &k, &l) && rewrite(AsmOp::Xchg(i, j), AsmOp::Xchg(k, l))) || + (!(mode_ & 1) && + ((is_rot() && rewrite(AsmOp::Custom("ROT", 3, 3))) || (is_rotrev() && rewrite(AsmOp::Custom("-ROT", 3, 3))) || + (is_2dup() && rewrite(AsmOp::Custom("2DUP", 2, 4))) || + (is_2swap() && rewrite(AsmOp::Custom("2SWAP", 2, 4))) || + (is_2over() && rewrite(AsmOp::Custom("2OVER", 2, 4))) || + (is_tuck() && rewrite(AsmOp::Custom("TUCK", 2, 3))) || + (is_2drop() && rewrite(AsmOp::Custom("2DROP", 2, 0))) || (is_xchg2(&i, &j) && rewrite(AsmOp::Xchg2(i, j))) || + (is_xcpu(&i, &j) && rewrite(AsmOp::XcPu(i, j))) || (is_puxc(&i, &j) && rewrite(AsmOp::PuXc(i, j))) || + (is_push2(&i, &j) && rewrite(AsmOp::Push2(i, j))) || (is_blkswap(&i, &j) && rewrite(AsmOp::BlkSwap(i, j))) || + (is_blkpush(&i, &j) && rewrite(AsmOp::BlkPush(i, j))) || (is_blkdrop(&i) && rewrite(AsmOp::BlkDrop(i))) || + (is_push_rot(&i) && rewrite(AsmOp::Push(i), AsmOp::Custom("ROT"))) || + (is_push_rotrev(&i) && rewrite(AsmOp::Push(i), AsmOp::Custom("-ROT"))) || + (is_push_xchg(&i, &j, &k) && rewrite(AsmOp::Push(i), AsmOp::Xchg(j, k))) || + (is_reverse(&i, &j) && rewrite(AsmOp::BlkReverse(i, j))) || + (is_nip_seq(&i, &j) && rewrite(AsmOp::Xchg(i, j), AsmOp::BlkDrop(i))) || + (is_pop_blkdrop(&i, &k) && rewrite(AsmOp::Pop(i), AsmOp::BlkDrop(k))) || + (is_blkdrop2(&i, &j) && rewrite(AsmOp::BlkDrop2(i, j))) || + (is_2pop_blkdrop(&i, &j, &k) && (k >= 3 && k <= 13 && i != j + 1 && i <= 15 && j <= 14 + ? rewrite(AsmOp::Xchg2(j + 1, i), AsmOp::BlkDrop(k + 2)) + : rewrite(AsmOp::Pop(i), AsmOp::Pop(j), AsmOp::BlkDrop(k)))) || + (is_xchg3(&i, &j, &k) && rewrite(AsmOp::Xchg3(i, j, k))) || + (is_xc2pu(&i, &j, &k) && rewrite(AsmOp::Xc2Pu(i, j, k))) || + (is_xcpuxc(&i, &j, &k) && rewrite(AsmOp::XcPuXc(i, j, k))) || + (is_xcpu2(&i, &j, &k) && rewrite(AsmOp::XcPu2(i, j, k))) || + (is_puxc2(&i, &j, &k) && rewrite(AsmOp::PuXc2(i, j, k))) || + (is_puxcpu(&i, &j, &k) && rewrite(AsmOp::PuXcPu(i, j, k))) || + (is_pu2xc(&i, &j, &k) && rewrite(AsmOp::Pu2Xc(i, j, k))) || + (is_push3(&i, &j, &k) && rewrite(AsmOp::Push3(i, j, k))))); } bool Optimizer::find() { @@ -500,17 +613,17 @@ bool Optimizer::optimize() { return f; } -AsmOpConsList optimize_code_head(AsmOpConsList op_list) { - Optimizer opt(std::move(op_list), op_rewrite_comments); +AsmOpConsList optimize_code_head(AsmOpConsList op_list, int mode) { + Optimizer opt(std::move(op_list), op_rewrite_comments, mode); opt.optimize(); return opt.extract_code(); } -AsmOpConsList optimize_code(AsmOpConsList op_list) { +AsmOpConsList optimize_code(AsmOpConsList op_list, int mode) { std::vector> v; while (op_list) { if (!op_list->car->is_comment()) { - op_list = optimize_code_head(std::move(op_list)); + op_list = optimize_code_head(std::move(op_list), mode); } if (op_list) { v.push_back(std::move(op_list->car)); @@ -524,11 +637,13 @@ AsmOpConsList optimize_code(AsmOpConsList op_list) { } void optimize_code(AsmOpList& ops) { - std::unique_ptr op_list; + AsmOpConsList op_list; for (auto it = ops.list_.rbegin(); it < ops.list_.rend(); ++it) { op_list = AsmOpCons::cons(std::make_unique(std::move(*it)), std::move(op_list)); } - op_list = optimize_code(std::move(op_list)); + for (int mode : {1, 1, 1, 1, 0, 0, 0, 0}) { + op_list = optimize_code(std::move(op_list), mode); + } ops.list_.clear(); while (op_list) { ops.list_.push_back(std::move(*(op_list->car))); diff --git a/submodules/ton/tonlib-src/crypto/func/parse-func.cpp b/submodules/ton/tonlib-src/crypto/func/parse-func.cpp index e04077918c..5c44444020 100644 --- a/submodules/ton/tonlib-src/crypto/func/parse-func.cpp +++ b/submodules/ton/tonlib-src/crypto/func/parse-func.cpp @@ -14,10 +14,11 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" #include "td/utils/crypto.h" +#include "common/refint.h" #include namespace sym { @@ -99,14 +100,21 @@ TypeExpr* parse_type1(Lexer& lex) { lex.cur().error_at("`", "` is not a type identifier"); } } - lex.expect('('); - if (lex.tp() == ')') { + int c; + if (lex.tp() == '[') { lex.next(); - return TypeExpr::new_unit(); + c = ']'; + } else { + lex.expect('('); + c = ')'; + } + if (lex.tp() == c) { + lex.next(); + return c == ')' ? TypeExpr::new_unit() : TypeExpr::new_tuple({}); } auto t1 = parse_type(lex); if (lex.tp() != ',') { - lex.expect(')'); + lex.expect(c); return t1; } std::vector tlist{1, t1}; @@ -114,8 +122,8 @@ TypeExpr* parse_type1(Lexer& lex) { lex.next(); tlist.push_back(parse_type(lex)); } - lex.expect(')'); - return TypeExpr::new_tensor(std::move(tlist)); + lex.expect(c); + return c == ')' ? TypeExpr::new_tensor(std::move(tlist)) : TypeExpr::new_tuple(std::move(tlist)); } TypeExpr* parse_type(Lexer& lex) { @@ -174,6 +182,53 @@ FormalArg parse_formal_arg(Lexer& lex, int fa_idx) { return std::make_tuple(arg_type, new_sym_def, loc); } +void parse_global_var_decl(Lexer& lex) { + TypeExpr* var_type = 0; + SrcLocation loc = lex.cur().loc; + if (lex.tp() == '_') { + lex.next(); + var_type = TypeExpr::new_hole(); + loc = lex.cur().loc; + } else if (lex.tp() != _Ident) { + var_type = parse_type(lex); + } else { + auto sym = sym::lookup_symbol(lex.cur().val); + if (sym && dynamic_cast(sym->value)) { + auto val = dynamic_cast(sym->value); + lex.next(); + var_type = val->get_type(); + } else { + var_type = TypeExpr::new_hole(); + } + } + if (lex.tp() != _Ident) { + lex.expect(_Ident, "global variable name"); + } + loc = lex.cur().loc; + SymDef* sym_def = sym::define_global_symbol(lex.cur().val, false, loc); + if (!sym_def) { + lex.cur().error_at("cannot define global symbol `", "`"); + } + if (sym_def->value) { + auto val = dynamic_cast(sym_def->value); + if (!val) { + lex.cur().error_at("symbol `", "` cannot be redefined as a global variable"); + } + try { + unify(var_type, val->sym_type); + } catch (UnifyError& ue) { + std::ostringstream os; + os << "cannot unify new type " << var_type << " of global variable `" << sym_def->name() + << "` with its previous type " << val->sym_type << ": " << ue; + lex.cur().error(os.str()); + } + } else { + sym_def->value = new SymValGlobVar{glob_var_cnt++, var_type}; + glob_vars.push_back(sym_def); + } + lex.next(); +} + FormalArgList parse_formal_args(Lexer& lex) { FormalArgList args; lex.expect('(', "formal argument list"); @@ -205,6 +260,18 @@ TypeExpr* extract_total_arg_type(const FormalArgList& arg_list) { return TypeExpr::new_tensor(std::move(type_list)); } +void parse_global_var_decls(Lexer& lex) { + lex.expect(_Global); + while (true) { + parse_global_var_decl(lex); + if (lex.tp() != ',') { + break; + } + lex.expect(','); + } + lex.expect(';'); +} + SymValCodeFunc* make_new_glob_func(SymDef* func_sym, TypeExpr* func_type, bool impure = false) { SymValCodeFunc* res = new SymValCodeFunc{glob_func_cnt, func_type, impure}; func_sym->value = res; @@ -239,30 +306,54 @@ bool check_global_func(const Lexem& cur, sym_idx_t func_name = 0) { } } +Expr* make_func_apply(Expr* fun, Expr* x) { + Expr* res; + if (fun->cls == Expr::_Glob) { + if (x->cls == Expr::_Tensor) { + res = new Expr{Expr::_Apply, fun->sym, x->args}; + } else { + res = new Expr{Expr::_Apply, fun->sym, {x}}; + } + res->flags = Expr::_IsRvalue | (fun->flags & Expr::_IsImpure); + } else { + res = new Expr{Expr::_VarApply, {fun, x}}; + res->flags = Expr::_IsRvalue; + } + return res; +} + Expr* parse_expr(Lexer& lex, CodeBlob& code, bool nv = false); -// parse ( E { , E } ) | () | id | num | _ +// parse ( E { , E } ) | () | [ E { , E } ] | [] | id | num | _ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { - if (lex.tp() == '(') { + if (lex.tp() == '(' || lex.tp() == '[') { + bool tf = (lex.tp() == '['); + int clbr = (tf ? ']' : ')'); SrcLocation loc{lex.cur().loc}; lex.next(); - if (lex.tp() == ')') { + if (lex.tp() == clbr) { lex.next(); - Expr* res = new Expr{Expr::_Tuple, {}}; + Expr* res = new Expr{Expr::_Tensor, {}}; res->flags = Expr::_IsRvalue; res->here = loc; res->e_type = TypeExpr::new_unit(); + if (tf) { + res = new Expr{Expr::_MkTuple, {res}}; + res->flags = Expr::_IsRvalue; + res->here = loc; + res->e_type = TypeExpr::new_tuple(res->args.at(0)->e_type); + } return res; } Expr* res = parse_expr(lex, code, nv); if (lex.tp() != ',') { - lex.expect(')'); + lex.expect(clbr); return res; } std::vector type_list; type_list.push_back(res->e_type); int f = res->flags; - res = new Expr{Expr::_Tuple, {res}}; + res = new Expr{Expr::_Tensor, {res}}; while (lex.tp() == ',') { lex.next(); auto x = parse_expr(lex, code, nv); @@ -275,8 +366,14 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { } res->here = loc; res->flags = f; - res->e_type = TypeExpr::new_tensor(std::move(type_list)); - lex.expect(')'); + res->e_type = TypeExpr::new_tensor(std::move(type_list), !tf); + if (tf) { + res = new Expr{Expr::_MkTuple, {res}}; + res->flags = f; + res->here = loc; + res->e_type = TypeExpr::new_tuple(res->args.at(0)->e_type); + } + lex.expect(clbr); return res; } int t = lex.tp(); @@ -306,7 +403,7 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { lex.next(); return res; } - if (t == _Int || t == _Cell || t == _Slice || t == _Builder || t == _Cont || t == _Type) { + if (t == _Int || t == _Cell || t == _Slice || t == _Builder || t == _Cont || t == _Type || t == _Tuple) { Expr* res = new Expr{Expr::_Type, lex.cur().loc}; res->flags = Expr::_IsType; res->e_type = TypeExpr::new_atomic(t); @@ -323,6 +420,16 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { lex.next(); return res; } + if (sym && dynamic_cast(sym->value)) { + auto val = dynamic_cast(sym->value); + Expr* res = new Expr{Expr::_GlobVar, lex.cur().loc}; + res->e_type = val->get_type(); + res->sym = sym; + res->flags = Expr::_IsLvalue | Expr::_IsRvalue | Expr::_IsImpure; + lex.next(); + return res; + } + bool auto_apply = false; Expr* res = new Expr{Expr::_Var, lex.cur().loc}; if (nv) { res->val = ~lex.cur().val; @@ -344,6 +451,7 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { } else if (val->type == SymVal::_Func) { res->e_type = val->get_type(); res->cls = Expr::_Glob; + auto_apply = val->auto_apply; } else if (val->idx < 0) { lex.cur().error_at("accessing variable `", "` being defined"); } else { @@ -354,6 +462,12 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { // std::cerr << "accessing symbol " << lex.cur().str << " : " << res->e_type << (val->impure ? " (impure)" : " (pure)") << std::endl; res->flags = Expr::_IsLvalue | Expr::_IsRvalue | (val->impure ? Expr::_IsImpure : 0); } + if (auto_apply) { + int impure = res->flags & Expr::_IsImpure; + delete res; + res = new Expr{Expr::_Apply, sym, {}}; + res->flags = Expr::_IsRvalue | impure; + } res->deduce_type(lex.cur()); lex.next(); return res; @@ -362,26 +476,10 @@ Expr* parse_expr100(Lexer& lex, CodeBlob& code, bool nv) { return nullptr; } -Expr* make_func_apply(Expr* fun, Expr* x) { - Expr* res; - if (fun->cls == Expr::_Glob) { - if (x->cls == Expr::_Tuple) { - res = new Expr{Expr::_Apply, fun->sym, x->args}; - } else { - res = new Expr{Expr::_Apply, fun->sym, {x}}; - } - res->flags = Expr::_IsRvalue | (fun->flags & Expr::_IsImpure); - } else { - res = new Expr{Expr::_VarApply, {fun, x}}; - res->flags = Expr::_IsRvalue; - } - return res; -} - // parse E { E } Expr* parse_expr90(Lexer& lex, CodeBlob& code, bool nv) { Expr* res = parse_expr100(lex, code, nv); - while (lex.tp() == '(' || (lex.tp() == _Ident && !is_special_ident(lex.cur().val))) { + while (lex.tp() == '(' || lex.tp() == '[' || (lex.tp() == _Ident && !is_special_ident(lex.cur().val))) { if (res->is_type()) { Expr* x = parse_expr100(lex, code, true); x->chk_lvalue(lex.cur()); // chk_lrvalue() ? @@ -446,7 +544,7 @@ Expr* parse_expr80(Lexer& lex, CodeBlob& code, bool nv) { lex.next(); auto x = parse_expr100(lex, code, false); x->chk_rvalue(lex.cur()); - if (x->cls == Expr::_Tuple) { + if (x->cls == Expr::_Tensor) { res = new Expr{Expr::_Apply, name, {obj}}; res->args.insert(res->args.end(), x->args.begin(), x->args.end()); } else { @@ -1168,8 +1266,9 @@ void parse_func_def(Lexer& lex) { } if (val->method_id.is_null()) { val->method_id = std::move(method_id); - } else if (val->method_id != method_id) { - lex.cur().error("integer method identifier for `"s + func_name.str + "` changed to a different value"); + } else if (td::cmp(val->method_id, method_id) != 0) { + lex.cur().error("integer method identifier for `"s + func_name.str + "` changed from " + + val->method_id->to_dec_string() + " to a different value " + method_id->to_dec_string()); } } if (f) { @@ -1191,9 +1290,13 @@ void parse_func_def(Lexer& lex) { bool parse_source(std::istream* is, const src::FileDescr* fdescr) { src::SourceReader reader{is, fdescr}; - Lexer lex{reader, true}; + Lexer lex{reader, true, ";,()[] ~."}; while (lex.tp() != _Eof) { - parse_func_def(lex); + if (lex.tp() == _Global) { + parse_global_var_decls(lex); + } else { + parse_func_def(lex); + } } return true; } diff --git a/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp b/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp index f682b49075..4d9b6a5fc3 100644 --- a/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp +++ b/submodules/ton/tonlib-src/crypto/func/stack-transform.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -334,6 +334,13 @@ bool StackTransform::apply_pop(int i) { } } +bool StackTransform::apply_blkpop(int k) { + if (!is_valid() || k < 0) { + return invalidate(); + } + return !k || (touch(k - 1) && shift(k)); +} + bool StackTransform::equal(const StackTransform &other, bool relaxed) const { if (!is_valid() || !other.is_valid()) { return false; @@ -394,6 +401,57 @@ bool StackTransform::is_xchg(int *i, int *j) const { return true; } +bool StackTransform::is_xchg_xchg(int i, int j, int k, int l) const { + if (is_valid() && !d && n <= 4 && (i | j | k | l) >= 0) { + StackTransform t; + return t.apply_xchg(i, j) && t.apply_xchg(k, l) && t <= *this; + } else { + return false; + } +} + +bool StackTransform::is_xchg_xchg(int *i, int *j, int *k, int *l) const { + if (!is_valid() || d || n > 4 || !dp || !is_permutation()) { + return false; + } + if (!n) { + *i = *j = *k = *l = 0; + return true; + } + if (n <= 2) { + *k = *l = 0; + return is_xchg(i, j); + } + if (n == 3) { + // rotation: a -> b -> c -> a + int a = A[0].first; + int b = A[0].second; + int s = (b == A[2].first ? 2 : 1); + int c = A[s].second; + if (b != A[s].first || c != A[3 - s].first || a != A[3 - s].second) { + return false; + } + // implement as XCHG s(a),s(c) ; XCHG s(a),s(b) + *i = *k = a; + *j = c; + *l = b; + return is_xchg_xchg(*i, *j, *k, *l); + } + *i = A[0].first; + *j = A[0].second; + if (get(*j) != *i) { + return false; + } + for (int s = 1; s < 4; s++) { + if (A[s].first != *j) { + *k = A[s].first; + *l = A[s].second; + return get(*l) == *k && is_xchg_xchg(*i, *j, *k, *l); + } + } + return false; +} + bool StackTransform::is_push(int i) const { return is_valid() && d == -1 && n == 1 && A[0].first == -1 && A[0].second == i; } @@ -411,6 +469,7 @@ bool StackTransform::is_push(int *i) const { // 0 2 3 4 .. = pop1 // 1 0 3 4 .. = pop2 // 1 2 0 4 .. = pop3 +// POP s(i) : 1 2 ... i-1 0 i+1 ... ; d=1, n=1, {(i,0)} bool StackTransform::is_pop(int i) const { if (!is_valid() || d != 1 || n > 1 || i < 0) { return false; @@ -436,6 +495,38 @@ bool StackTransform::is_pop(int *i) const { return false; } +// POP s(i) ; POP s(j) : 2 ... i-1 0 i+1 ... j 1 j+2 ... ; d=2, n=2, {(i,0),(j+1,1)} if i <> j+1 +bool StackTransform::is_pop_pop(int i, int j) const { + if (is_valid() && d == 2 && n <= 2 && i >= 0 && j >= 0) { + StackTransform t; + return t.apply_pop(i) && t.apply_pop(j) && t <= *this; + } else { + return false; + } +} + +bool StackTransform::is_pop_pop(int *i, int *j) const { + if (!is_valid() || d != 2 || n > 2) { + return false; + } + if (!n) { + *i = *j = 0; // 2DROP + } else if (n == 2) { + *i = A[0].first - A[0].second; + *j = A[1].first - A[1].second; + if (A[0].second > A[1].second) { + std::swap(*i, *j); + } + } else if (!A[0].second) { + *i = A[0].first; + *j = 0; + } else { + *i = 0; + *j = A[0].first - 1; + } + return is_pop_pop(*i, *j); +} + const StackTransform StackTransform::rot{2, 0, 1, 3}; const StackTransform StackTransform::rot_rev{1, 2, 0, 3}; @@ -447,6 +538,53 @@ bool StackTransform::is_rotrev() const { return equal(rot_rev, true); } +// PUSH i ; ROT == 1 i 0 2 3 +bool StackTransform::is_push_rot(int i) const { + return is_valid() && d == -1 && i >= 0 && is_trivial_after(3) && get(0) == 1 && get(1) == i && get(2) == 0; +} + +bool StackTransform::is_push_rot(int *i) const { + return is_valid() && (*i = get(1)) >= 0 && is_push_rot(*i); +} + +// PUSH i ; -ROT == 0 1 i 2 3 +bool StackTransform::is_push_rotrev(int i) const { + return is_valid() && d == -1 && i >= 0 && is_trivial_after(3) && get(0) == 0 && get(1) == 1 && get(2) == i; +} + +bool StackTransform::is_push_rotrev(int *i) const { + return is_valid() && (*i = get(2)) >= 0 && is_push_rotrev(*i); +} + +// PUSH s(i) ; XCHG s(j),s(k) --> i 0 1 .. i .. +// PUSH s(i) ; XCHG s(0),s(k) --> k-1 0 1 .. k-2 i k .. +bool StackTransform::is_push_xchg(int i, int j, int k) const { + StackTransform t; + return is_valid() && d == -1 && n <= 3 && t.apply_push(i) && t.apply_xchg(j, k) && t <= *this; +} + +bool StackTransform::is_push_xchg(int *i, int *j, int *k) const { + if (!(is_valid() && d == -1 && n <= 3 && n > 0)) { + return false; + } + int s = get(0); + if (s < 0) { + return false; + } + *i = s; + *j = 0; + if (n == 1) { + *k = 0; + } else if (n == 2) { + *k = s + 1; + *i = get(s + 1); + } else { + *j = A[1].first + 1; + *k = A[2].first + 1; + } + return is_push_xchg(*i, *j, *k); +} + // XCHG s1,s(i) ; XCHG s0,s(j) bool StackTransform::is_xchg2(int i, int j) const { StackTransform t; @@ -465,10 +603,9 @@ bool StackTransform::is_xchg2(int *i, int *j) const { if (*i < 0 || *j < 0) { return false; } - if (n != 3) { - return is_xchg2(*i, *j); - } - if (*i) { + if (n == 2 && !*i) { + *j = *i; // XCHG s0,s1 = XCHG2 s0,s0 + } else if (n == 3 && *i) { // XCHG2 s(i),s(i) = XCHG s1,s(i) ; XCHG s0,s(i) : 0->1, 1->i *j = *i; } // XCHG2 s0,s(i) = XCHG s0,s1 ; XCHG s0,s(i) : 0->i, 1->0 @@ -735,6 +872,28 @@ bool StackTransform::is_blkdrop(int *i) const { return false; } +// 0 1 .. j-1 j+i j+i+1 ... +bool StackTransform::is_blkdrop2(int i, int j) const { + if (!is_valid() || d != i || i <= 0 || j < 0 || dp < i + j || n != j || !is_trivial_after(j)) { + return false; + } + for (int s = 0; s < j; s++) { + if (get(s) != s) { + return false; + } + } + return true; +} + +bool StackTransform::is_blkdrop2(int *i, int *j) const { + if (is_valid() && is_blkdrop2(d, n)) { + *i = d; + *j = n; + return true; + } + return false; +} + // equivalent to i times PUSH s(j) bool StackTransform::is_blkpush(int *i, int *j) const { if (!is_valid() || d >= 0) { @@ -800,6 +959,77 @@ bool StackTransform::is_nip_seq(int *i, int *j) const { } } +// POP s(i); BLKDROP k (usually for i >= k >= 0) +bool StackTransform::is_pop_blkdrop(int i, int k) const { + StackTransform t; + return is_valid() && d == k + 1 && t.apply_pop(i) && t.apply_blkpop(k) && t <= *this; +} + +// POP s(i); BLKDROP k == XCHG s0,s(i); BLKDROP k+1 for i >= k >= 0 +// k+1 k+2 .. i-1 0 i+1 .. +bool StackTransform::is_pop_blkdrop(int *i, int *k) const { + if (is_valid() && n == 1 && d > 0 && !A[0].second) { + *k = d - 1; + *i = A[0].first; + return is_pop_blkdrop(*i, *k); + } else { + return false; + } +} + +// POP s(i); POP s(j); BLKDROP k (usually for i<>j >= k >= 0) +bool StackTransform::is_2pop_blkdrop(int i, int j, int k) const { + StackTransform t; + return is_valid() && d == k + 2 && t.apply_pop(i) && t.apply_pop(j) && t.apply_blkpop(k) && t <= *this; +} + +// POP s(i); POP s(j); BLKDROP k == XCHG s0,s(i); XCHG s1,s(j+1); BLKDROP k+2 (usually for i<>j >= k >= 2) +// k+2 k+3 .. i-1 0 i+1 ... j 1 j+2 ... +bool StackTransform::is_2pop_blkdrop(int *i, int *j, int *k) const { + if (is_valid() && n == 2 && d >= 2 && A[0].second + A[1].second == 1) { + *k = d - 2; + int t = (A[0].second > 0); + *i = A[t].first; + *j = A[1 - t].first - 1; + return is_2pop_blkdrop(*i, *j, *k); + } else { + return false; + } +} + +// PUSHCONST c ; ROT == 1 -1000 0 2 3 +bool StackTransform::is_const_rot(int c) const { + return is_valid() && d == -1 && is_trivial_after(3) && get(0) == 1 && c <= c_start && get(1) == c && get(2) == 0; +} + +bool StackTransform::is_const_rot(int *c) const { + return is_valid() && (*c = get(1)) <= c_start && is_const_rot(*c); +} + +// PUSHCONST c ; POP s(i) == 0 1 .. i-1 -1000 i+1 ... +bool StackTransform::is_const_pop(int c, int i) const { + return is_valid() && !d && n == 1 && i > 0 && c <= c_start && get(i - 1) == c; +} + +bool StackTransform::is_const_pop(int *c, int *i) const { + if (is_valid() && !d && n == 1 && A[0].second <= c_start) { + *i = A[0].first + 1; + *c = A[0].second; + return is_const_pop(*c, *i); + } else { + return false; + } +} + +// PUSH i ; PUSHCONST c == c i 0 1 2 ... +bool StackTransform::is_push_const(int i, int c) const { + return is_valid() && d == -2 && c <= c_start && i >= 0 && is_trivial_after(2) && get(0) == c && get(1) == i; +} + +bool StackTransform::is_push_const(int *i, int *c) const { + return is_valid() && d == -2 && n == 2 && is_push_const(*i = get(1), *c = get(0)); +} + void StackTransform::show(std::ostream &os, int mode) const { if (!is_valid()) { os << ""; diff --git a/submodules/ton/tonlib-src/crypto/func/test/a10.fc b/submodules/ton/tonlib-src/crypto/func/test/a10.fc new file mode 100644 index 0000000000..70c7871d70 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/a10.fc @@ -0,0 +1,9 @@ +_ f(int a, int x) { + int y = 0; + int z = 0; + while ((y = x * x) > a) { + x -= 1; + z = 1; + } + return (y, z); +} diff --git a/submodules/ton/tonlib-src/crypto/func/test/a11.fc b/submodules/ton/tonlib-src/crypto/func/test/a11.fc new file mode 100644 index 0000000000..45bdf1f368 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/a11.fc @@ -0,0 +1,28 @@ +_ f(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, int cnt, cell credits, cell vdict, int elect) { + return (ds, elect, credits); +} + +_ g(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, int cnt, cell credits, int elect) { + return (ds, elect, credits); +} + +_ h(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, cell credits, int elect) { + return (ds, elect, credits); +} + +_ h2(slice ds, int total_weight, int elect_at, cell frozen, int total_stakes, cell credits, int elect) { + return (ds, credits, elect); +} + +_ h3(int pubkey, int adnl_addr, int stake, int tot_weight, tuple vinfo) { + return (pubkey, tot_weight, stake, vinfo); +} + +_ z(int a, int b) { + return (b, 0, a); +} + +_ z2(int a, int b) { + return (0, a, b); +} + diff --git a/submodules/ton/tonlib-src/crypto/func/test/a6_4.fc b/submodules/ton/tonlib-src/crypto/func/test/a6_4.fc new file mode 100644 index 0000000000..d7e6596a09 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/a6_4.fc @@ -0,0 +1,20 @@ +var calc_root(m) { + int base = 1; + repeat(70) { base *= 10; } + var (a, b, c) = (1, 0, - m); + var (p1, q1, p2, q2) = (1, 0, 0, 1); + do { + int k = -1; + var (a1, b1, c1) = (0, 0, 0); + do { + k += 1; + (a1, b1, c1) = (a, b, c); + c += b; + c += b += a; + } until (c > 0); + (a, b, c) = (- c1, - b1, - a1); + (p1, q1) = (k * p1 + q1, p1); + (p2, q2) = (k * p2 + q2, p2); + } until (p1 > base); + return (p1, q1, p2, q2); +} diff --git a/submodules/ton/tonlib-src/crypto/func/test/a6_5.fc b/submodules/ton/tonlib-src/crypto/func/test/a6_5.fc new file mode 100644 index 0000000000..ece7cd38d2 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/a6_5.fc @@ -0,0 +1,20 @@ +var twice(f, x) { + return f (f x); +} + +_ sqr(x) { + return x * x; +} + +var main(x) { + var f = sqr; + return twice(f, x) * f(x); +} + +var pow6(x) { + return twice(sqr, x) * sqr(x); +} + +_ q() { + return false; +} diff --git a/submodules/ton/tonlib-src/crypto/func/test/c1.fc b/submodules/ton/tonlib-src/crypto/func/test/c1.fc new file mode 100644 index 0000000000..1a07baca10 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/c1.fc @@ -0,0 +1,37 @@ +global int x, y, z; +global (cell, slice) y; +global ((int, int) -> int) op; + +_ get() { + var t = z + 1; + return x; +} + +_ pre_next() { + return x + 1; +} + +() init() impure { + ;; global x; + x = 0; +} + +int next() impure { + ;; global x; + return x += 1; +} + +_ set_y(x, w) { + y = (w, x); +} + +_ get_y() impure { + return y; +} + +int main(int c) { + init(); + c += next(); + return c + pre_next(); +} + diff --git a/submodules/ton/tonlib-src/crypto/func/test/c2.fc b/submodules/ton/tonlib-src/crypto/func/test/c2.fc new file mode 100644 index 0000000000..277c70530a --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/c2.fc @@ -0,0 +1,10 @@ +global ((int, int) -> int) op; + +int check_assoc(int a, int b, int c) { + return op(op(a, b), c) == op(a, op(b, c)); +} + +int main() { + op = _+_; + return check_assoc(2, 3, 9); +} diff --git a/submodules/ton/tonlib-src/crypto/func/test/c2_1.fc b/submodules/ton/tonlib-src/crypto/func/test/c2_1.fc new file mode 100644 index 0000000000..3bf863a6d7 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/c2_1.fc @@ -0,0 +1,7 @@ +_ check_assoc(op, a, b, c) { + return op(op(a, b), c) == op(a, op(b, c)); +} + +int main() { + return check_assoc(_+_, 2, 3, 9); +} diff --git a/submodules/ton/tonlib-src/crypto/func/test/w8.fc b/submodules/ton/tonlib-src/crypto/func/test/w8.fc new file mode 100644 index 0000000000..bd0696e736 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/w8.fc @@ -0,0 +1,22 @@ +int check_signatures(msg_hash, signatures, signers, bitmask_size) impure { + var bitmask = 0; + var id = -1; + do { + (id, var signature, var f) = signatures.udict_get_next?(32, id); + if (f){ + var sig = signature.preload_bits(512); + var public_key = -1; + do { + (public_key, var cs, var _found) = signers.udict_get_next?(256, public_key); + if (_found){ + if (check_signature(msg_hash, sig, public_key)){ + var signer_index = cs~load_uint(bitmask_size); + bitmask = bitmask | (1 << (signer_index - 1)); + } + } + } until (~ _found); + ;; signature~touch(); + } + } until (~ f); + return bitmask; +} diff --git a/submodules/ton/tonlib-src/crypto/func/test/w9.fc b/submodules/ton/tonlib-src/crypto/func/test/w9.fc new file mode 100644 index 0000000000..d943554210 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/func/test/w9.fc @@ -0,0 +1,8 @@ +_ g(s) { + var (z, t) = (17, s); + while (z > 0) { + t = s; + z -= 1; + } + return ~ t; +} diff --git a/submodules/ton/tonlib-src/crypto/func/unify-types.cpp b/submodules/ton/tonlib-src/crypto/func/unify-types.cpp index 698d21feba..0a10141624 100644 --- a/submodules/ton/tonlib-src/crypto/func/unify-types.cpp +++ b/submodules/ton/tonlib-src/crypto/func/unify-types.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "func.h" @@ -47,6 +47,12 @@ void TypeExpr::compute_width() { maxw = w_inf; } break; + case te_Tuple: + minw = maxw = 1; + for (TypeExpr* arg : args) { + arg->compute_width(); + } + break; case te_Indirect: minw = args[0]->minw; maxw = args[0]->maxw; @@ -84,6 +90,14 @@ bool TypeExpr::recompute_width() { } return true; } + case te_Tuple: { + for (TypeExpr* arg : args) { + if (arg->minw > 1 || arg->maxw < 1 || arg->minw > arg->maxw) { + return false; + } + } + return true; + } default: return false; } @@ -233,7 +247,9 @@ std::ostream& TypeExpr::print(std::ostream& os, int lex_level) { } } case te_Tensor: { - os << "("; + if (lex_level > -127) { + os << "("; + } auto c = args.size(); if (c) { for (const auto& x : args) { @@ -243,7 +259,25 @@ std::ostream& TypeExpr::print(std::ostream& os, int lex_level) { } } } - return os << ")"; + if (lex_level > -127) { + os << ")"; + } + return os; + } + case te_Tuple: { + os << "["; + auto c = args.size(); + if (c == 1 && args[0]->constr == te_Tensor) { + args[0]->print(os, -127); + } else if (c) { + for (const auto& x : args) { + x->print(os); + if (--c) { + os << ", "; + } + } + } + return os << "]"; } case te_Map: { assert(args.size() == 2); @@ -312,7 +346,7 @@ void check_update_widths(TypeExpr* te1, TypeExpr* te2) { check_width_compat(te1, te2); te1->minw = te2->minw = std::max(te1->minw, te2->minw); te1->maxw = te2->maxw = std::min(te1->maxw, te2->maxw); - assert(te1->minw <= te2->minw); + assert(te1->minw <= te1->maxw); } void unify(TypeExpr*& te1, TypeExpr*& te2) { diff --git a/submodules/ton/tonlib-src/crypto/parser/symtable.h b/submodules/ton/tonlib-src/crypto/parser/symtable.h index 6c77ca7b03..88f683bd3e 100644 --- a/submodules/ton/tonlib-src/crypto/parser/symtable.h +++ b/submodules/ton/tonlib-src/crypto/parser/symtable.h @@ -32,7 +32,7 @@ namespace sym { typedef int var_idx_t; struct SymValBase { - enum { _Param, _Var, _Func, _Typename }; + enum { _Param, _Var, _Func, _Typename, _GlobVar }; int type; int idx; SymValBase(int _type, int _idx) : type(_type), idx(_idx) { diff --git a/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif b/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif index ed82499b5f..1330a446f1 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/CreateState.fif @@ -242,3 +242,7 @@ dictnew constant special-dict register_smc Masterchain swap 6 .Addr cr } : create-wallet0 + +{ dup tlb-type-lookup { nip } { "unknown TLB type " swap $+ abort } cond } : $>tlb +{ bl word $>tlb 1 'nop } ::_ tlb: +{ [-o] (add|update|prolong) ... " +cr +tab + +"Creates the internal message body containing a request to automatic DNS smart contract created by new-auto-dns.fif, " + +"to be sent later with a suitable payment from a wallet to , and saves it into ('" savefile $+ +"' by default). " + +"The operation to be performed is one of" +cr +tab + +"add { owner | cat (smc | next | adnl | text ) }" +cr +tab + +"update { owner | cat (smc | next | adnl | text ) }" +cr +tab + +"prolong " + disable-digit-options generic-help-setopt + "o" "--output" { =: savefile } short-long-option-arg + "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options + +$# 4 < ' usage if +4 :$1..n + +$1 true parse-load-address =: bounce 2=: dest-addr +$2 dup =: main-op-name atom =: main-op +$3 dup =: subdomain $len 127 > abort"subdomain name too long" +$4 parse-int dup 30 1<< < { now + } if =: expire-at + +{ $* @ dup null? { second $@ ! } { drop } cond } : @skip +{ $* @ null? } : @end? +{ $* @ uncons $* ! } : @next +{ @next drop } 4 times + +main-op dup `add eq? over `update eq? or swap `prolong eq? or +{ "unknown main operation '" main-op-name $+ +"'; one of 'add', 'update' or 'prolong' expected" abort } ifnot +main-op `prolong eq? not =: need-params + +$# 4 > need-params <> abort"extra parameters, or no parameters for chosen main operation" + +variable Values dictnew Values ! +// ( i c -- ) +{ over 0= abort"category cannot be zero" + idict!+ not abort"duplicate category id" + Values ! +} : register-value + +{ @end? abort"category number expected" @next (number) 1 <> abort"category must be integer" + dup 16 fits not abort"category does not fit into 16 bit integer" + dup 0= abort"category must be non-zero" +} : parse-cat-num +{ @end? abort"smart contract address expected" + @next false parse-load-address drop +} : cl-parse-smc-addr +{ @end? abort"adnl address expected" + @next parse-adnl-addr +} : cl-parse-adnl-addr +{ } : serialize-smc-addr +{ } : serialize-next-resolver +{ } : serialize-adnl-addr +{ } : serialize-text +{ @end? abort"subdomain record value expected" @next + dup "smc" $= { drop cl-parse-smc-addr serialize-smc-addr } { + dup "next" $= { drop cl-parse-smc-addr serialize-next-resolver } { + dup "adnl" $= { drop cl-parse-adnl-addr serialize-adnl-addr } { + dup "text" $= { drop @next serialize-text } { + "unknown record type "' swap $+ +"'" abort + } cond } cond } cond } cond +} : parse-value +{ @next dup "owner" $= { drop -2 cl-parse-smc-addr serialize-smc-addr } { + dup "cat" $= { drop parse-cat-num parse-value } { + "unknown action '" swap $+ +"'" abort + } cond } cond + register-value +} : parse-action +{ { @end? not } { parse-action } while } : parse-actions +parse-actions + +// ( S -- S1 .. Sn n ) +{ 1 swap { dup "." $pos dup 0>= } { $| 1 $| nip rot 1+ swap } while drop swap +} : split-by-dots +// ( S -- s ) +{ dup $len dup 0= abort"subdomain cannot be empty" 126 > abort"subdomain too long" + dup 0 chr $pos 1+ abort"subdomain contains null characters" + split-by-dots s + +main-op ( _( `add 0x72656764 ) _( `update 0x75706464 ) _( `prolong 0x70726f6c ) ) +assq-val not abort"unknown main operation" +=: op-id + +."Automatic DNS smart contract address = " dest-addr 2dup .addr cr 6 .Addr cr + +."Action: " main-op .l subdomain type space expire-at . cr +."Operation code: 0x" op-id 8 0X. cr +."Value: " +Values @ dup null? { drop ."(none)" } { =: actions-builder + +// create an internal message +now 32 << actions-builder hashu 32 1<<1- and + =: query_id +s tuck sbits 8 / 7 i, swap s, + main-op `prolong eq? { Values @ ref, } ifnot + expire-at 32 u, b> +dup ."Internal message body is: " B dup Bx. cr +."Query_id is " query_id dup . ."= 0x" X. cr +savefile tuck B>file +."(Saved to file " type .")" cr diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp index 91b450367d..45f74a0656 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.cpp @@ -1 +1 @@ -with_tvm_code("config", "te6ccgECJwEAA48AART/APSkE/Sg8sgLAQIBIAIDAgLHBAUCAvEjJAIBzQYHAAaqglsCASAICQIBIBUWAgEgCgsCASAQEQIBIAwNAgEgDg8A6QB0NMD+kAwIPpEAaQDcbATsSPHALGSXwPgAtMf0z8ighBOVlNUuo49MgHU0XH4MyBukjB/lNDXC//iA3AEupsyIfAEIfgjvAK8sJEC4p2AJFjwAYIQ7nZPS/AG4DGCEO52T2/wB+AQJF8EIMAAAYMesLHypYAAlO1E0NRQM4Ag9BXIzAHPFsntVIAApO1E0NTTH9P/IMcAkW2T9AQB4gHRgABsyBTMEssfy//0AMntVIAIBIBITAgEgFBQANzQ0wcBpu9+sPJJ0x/TH9MP0w8wIMIA8om+8omAAKxwgBjIywVQBc8WFMtuyx/LP8kB+wCAACSAQPAFgAgEgFxgCASAdHgIBIBkaAgEgGxwAWxx+DPQ1wv/+COCEE5Db2RwggDE/8jLEBTL/4Md+gITy2oSyx/LPwHPFslw+wCAAoQhghBDZlAhupwx0x/U0UATgCD0FQHgIYIQTkNvZLqOEDHUIfsE7UMC7VMB8QaC8gDgIYIQUGJLIbqVMTHT/9HgIYIQTkPvBbqTMfAI4DDyYIAEBICYAOTTB4AgsxKwwFPyqdMfAYIQjoEnirryqdP/0z8wgAgEgHyACASAhIgAfHAgcMjKAMs/y/8BzxbJ0IAANPQE0z/T/4AAZMgU9AASyz/L/wHPFoABFFsBcbCeIPkBMSGDB/QOb6ExkN+d1wv/IYMH9A5voTHyquKAArQw7UTQ1IAggCRTMfRqIG6TECNbjjgg0CDXScInjinTB9cLHwHAEfgjEr6wjhUBgCJUEET0blRTIfRuMIAkQBP0WjCTECNb4pQQNF8D4uLIzAHPFsntVIAHZIMI1xgg0x/TH9Mf+CMSufJj7UTQ1NMf0/8gxwCRbZP0BAHiAdFRUrryoSWCEFZvdGWhfrCK4Qb5AVQQdvkQ8qL4AAWkVHUEJcgUzBLLH8v/9ADJ7VT4DxA1RFXwCUMDyBTMEssfy//0AMntVICUBqgPTDyHbPNMHgCCzErDAU/Kp0x8BghCOgSeKuvKp0//TPzAJ+QFAqvkQ8qL4AAGkVHIDJ8gUzBLLH8v/9ADJ7VT4DxA1RxbwD8gUzBLLH8v/9ADJ7VQmADaAIvgzIG6SW23g0IBo1yHIAc8WyYAQ9A5voTA="); +with_tvm_code("config", "te6ccgECHQEAA5oAART/APSkE/S88sgLAQIBIAIDAgFIBAUCAvEYGQICxQYHABGgmS/aiaGuFj8CAc0ICQAGqoJbAgEgCgsCASATFAIBSAwNAgEgDg8A6wB0NMD+kAwIPpEAaQDcbATsSPHALGSXwPgAtMf0z8ighBOVlNUuo4+bBLU0XH4MyBukjB/lNDXC//iA3AEup0yIfAE+CNSILwCvLAC3gKdgCRY8AGCEO52T0vwBuAxghDudk9v8AfgECRfBCDAAAGDHrCx8qWAAJTtRNDUUDOAIPQVyMwBzxbJ7VSACASAQEQIBIBISADM0NMHAcAS8onTH9Mf0w/TDzAgwgDyib7yiYAArHCAGMjLBVAFzxYUy27LH8s/yQH7AIAAJIBA8AWACAUgVFgHh8CuNhNkfyAqYNBg/oHN9DPkeuF/6mDQYP6BzfQkHlVcUwagnoCaZ/p/8wYNqoKgzggCfEojF7KmLaZOADvKalACHoHN9CYya+ENvBAEGR8EeeAoDHACHohgdAQU4GBVQAJXk0ttgkBQYP6LZgA8C0KQXAFscfgz0NcL//gjghBOQ29kcIIAxP/IyxAUy/+DHfoCE8tqEssfyz8BzxbJcPsAgAKcIYIQQ2ZQIbqcMdMf1NFAE4Ag9BUB4CGCEE5Db2S6jhMx1CH7BO1DAtDtHu1TAfEGgvIA4CGCEFBiSyG6lWwh0//R4CGCEE5D7wW6kzHwCOAw8mCAAJAPI9AASyz/L/wHPFgKDB/RDbQChDDtRNDUgCCAJFMx9GogbpFbjjMg0CDXScInjibTB9cLH/gjuwHAErCOFYAiWFFE9G5UUyH0bjCAJEAT9FowAZFb4pJfA+LiAcjMAc8Wye1UgAccgwjXGCDTH9Mf0x/4IxK58mPtRNDU0x/T//QE0VFSuvKhJYIQVm90ZaF+sIrhBvkBVBB2+RDyovgABaRUdQQlA8jMEssfy//0AMntVPgPEDVEVfAJQwMDyMwSyx/L//QAye1UgGgLWA9MPIds8AdMHgCCzErDAU/Kp0x8BghCOgSeKuvKp0//TPzAK+QFAu/kQ8qL4AAKkVHMEKAPIzBLLH8v/9ADJ7VT4D4Ai+DP5ABBXEDQQI0iQ8A9Uc0IkA8jMEssfy//0AMntVCBukl8FiuIbHABOgCL4MyBuk1ttcODQ0wcBwBLyqIBg1yHTP8gBzxbJEoAQ9A5voTABAC7THxA0ECTwCUMDA8jMEssfy//0AMntVA=="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif index 4899527fc1..585f03b666 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/config-code.fif @@ -13,12 +13,13 @@ PROGRAM{ DECLPROC perform_action DECLPROC get_validator_descr DECLPROC unpack_validator_descr - DECLPROC create_new_entry - DECLPROC unpack_suggestion - DECLPROC pack_suggestion + DECLPROC new_proposal + DECLPROC unpack_proposal + DECLPROC pack_proposal DECLPROC register_vote DECLPROC recv_external DECLPROC run_ticktock + 85143 DECLMETHOD seqno set_conf_param PROC:<{ // index value c4 PUSH // index value _3 @@ -38,24 +39,16 @@ PROGRAM{ // c4 PUSH // _1 CTOS // cs - LDREF // _6 cs - 32 LDU // _6 _8 cs - 256 LDU // cfg_dict stored_seqno public_key cs - DUP // cfg_dict stored_seqno public_key cs cs - SEMPTY // cfg_dict stored_seqno public_key cs _15 - IF:<{ // cfg_dict stored_seqno public_key cs - NEWDICT // cfg_dict stored_seqno public_key cs _16 - }>ELSE<{ // cfg_dict stored_seqno public_key cs - LDDICT // cfg_dict stored_seqno public_key _16 cs - SWAP // cfg_dict stored_seqno public_key cs _16 - }> // cfg_dict stored_seqno public_key cs vote_dict - SWAP // cfg_dict stored_seqno public_key vote_dict cs + LDREF // _4 cs + 32 LDU // _4 _6 cs + 256 LDU // _4 _6 _9 cs + LDDICT // res res res res cs ENDS }> store_data PROC:<{ // cfg_dict stored_seqno public_key vote_dict - NEWC // cfg_dict stored_seqno public_key vote_dict _4 - s1 s4 XCHG // vote_dict stored_seqno public_key cfg_dict _4 + s0 s3 XCHG + NEWC // vote_dict stored_seqno public_key cfg_dict _4 STREF // vote_dict stored_seqno public_key _5 s1 s2 XCHG // vote_dict public_key stored_seqno _5 32 STU // vote_dict public_key _7 @@ -69,19 +62,17 @@ PROGRAM{ CTOS // cs 8 LDU // _4 cs SWAP // cs _4 - -17 ADDCONST // cs _8 - -2 PUSHINT // cs _8 _9=-2 - AND // cs _10 - 9 THROWIF + 18 EQINT // cs _8 + 9 THROWIFNOT 32 LDU // utime_since cs 32 LDU // utime_since utime_until cs 16 LDU // utime_since utime_until total cs - 16 LDU // utime_since utime_until total _44 _43 + 16 LDU // utime_since utime_until total _42 _41 DROP // utime_since utime_until total main DUP // utime_since utime_until total main main - 0 GTINT // utime_since utime_until total main _30 + 0 GTINT // utime_since utime_until total main _28 9 THROWIFNOT - GEQ // utime_since utime_until _33 + GEQ // utime_since utime_until _31 9 THROWIFNOT }> send_answer PROC:<{ @@ -139,8 +130,7 @@ PROGRAM{ 1314280276 PUSHINT // s_addr src_addr tag query_id in_msg tag _29=1314280276 EQUAL // s_addr src_addr tag query_id in_msg _30 IFJMP:<{ // s_addr src_addr tag query_id in_msg - s2 POP // s_addr src_addr in_msg query_id - SWAP // s_addr src_addr query_id in_msg + 1 2 BLKDROP2 // s_addr src_addr query_id in_msg LDREF // s_addr src_addr query_id vset in_msg ENDS 1 PUSHINT // s_addr src_addr query_id vset _36=1 @@ -162,17 +152,17 @@ PROGRAM{ s2 POP // s_addr vset query_id OVER // s_addr vset query_id vset check_validator_set CALLDICT // s_addr vset query_id t_since t_until - OVER - NOW // s_addr vset query_id t_since t_until t_since t + NOW // s_addr vset query_id t_since t_until t + s2 s(-1) PUXC // s_addr vset query_id t_since t_until t_since t GREATER // s_addr vset query_id t_since t_until _53 s0 s2 XCHG // s_addr vset query_id _53 t_until t_since GREATER // s_addr vset query_id _53 _54 AND // s_addr vset query_id ok - }>ELSE<{ - s0 s2 XCHG // s_addr vset query_id ok - }> + s0 s2 XCHG // s_addr ok query_id vset + }> // s_addr ok query_id vset + s0 s2 XCHG // s_addr vset query_id ok IFJMP:<{ // s_addr vset query_id - 36 PUSHINT // s_addr vset query_id _56=36 + 36 PUSHINT ROT // s_addr query_id _56=36 vset set_conf_param CALLDICT 4000730955 PUSHINT // s_addr query_id _58=4000730955 @@ -248,23 +238,24 @@ PROGRAM{ SETCODE c3 PUSH // cfg_dict public_key new_code cs old_code s0 s2 XCHG // cfg_dict public_key old_code cs new_code + CTOS // cfg_dict public_key old_code cs _25 + BLESS // cfg_dict public_key old_code cs _26 c3 POP SWAP // cfg_dict public_key cs old_code after_code_upgrade CALLDICT 0 THROW }> // cfg_dict public_key action cs OVER - 1348619041 PUSHINT // cfg_dict public_key action cs action _29=1348619041 - EQUAL // cfg_dict public_key action cs _30 + 1348619041 PUSHINT // cfg_dict public_key action cs action _31=1348619041 + EQUAL // cfg_dict public_key action cs _32 IFJMP:<{ // cfg_dict public_key action cs - NIP - NIP // cfg_dict cs + 2 1 BLKDROP2 // cfg_dict cs 256 LDU // cfg_dict public_key cs ENDS }> // cfg_dict public_key action cs OVER - 1313074949 PUSHINT // cfg_dict public_key action cs action _35=1313074949 - EQUAL // cfg_dict public_key action cs _36 + 1313074949 PUSHINT // cfg_dict public_key action cs action _37=1313074949 + EQUAL // cfg_dict public_key action cs _38 IFJMP:<{ // cfg_dict public_key action cs NIP // cfg_dict public_key cs change_elector_code CALLDICT @@ -281,18 +272,26 @@ PROGRAM{ IFJMP:<{ // idx vset 2DROP // PUSHNULL // _5 + 0 PUSHINT // _5 _6=0 }> // idx vset CTOS // idx cs - 104 PUSHINT // idx cs _17 + 8 LDU // idx _10 cs + SWAP // idx cs _10 + 18 EQINT // idx cs _14 + 40 THROWIFNOT + 96 PUSHINT // idx cs _23 SDSKIPFIRST // idx cs - NEWC // idx cs _20 - SWAP // idx _20 cs - STSLICER // idx _21 - ENDC // idx dict - 16 PUSHINT // idx dict _25=16 + 64 LDU // idx total_weight cs + NEWC // idx total_weight cs _30 + SWAP // idx total_weight _30 cs + STSLICER // idx total_weight _31 + ENDC // idx total_weight dict + s1 s2 XCHG + 16 PUSHINT // total_weight idx dict _35=16 DICTUGET - NULLSWAPIFNOT // _27 _28 - DROP // value + NULLSWAPIFNOT // total_weight _41 _42 + DROP // total_weight value + SWAP // value total_weight }> unpack_validator_descr PROC:<{ // cs @@ -312,30 +311,22 @@ PROGRAM{ 64 LDU // _18 _31 _30 DROP // _18 _21 }> - create_new_entry PROC:<{ + new_proposal PROC:<{ // cs - 0 PUSHINT // cs _1=0 - DUP // cs _1=0 _2=0 - FALSE // cs _1=0 _2=0 _3 - NEWC // cs _1=0 _2=0 _3 _4 - 1 STI // cs _1=0 _2=0 _6 - 64 STU // cs _1=0 _8 - 256 STU // cs _10 - SWAP // _10 cs - STSLICER // _11 - ENDC // _12 - CTOS // _13 + PUSHNULL // cs _1 + 0 PUSHINT // cs _1 _2=0 + s0 s1 s2 XCPUXC // _1 _2=0 _3=0 cs }> - unpack_suggestion PROC:<{ + unpack_proposal PROC:<{ // cs LDDICT // _1 cs 64 LDU // _1 _3 cs 256 LDU // _1 _3 _6 cs }> - pack_suggestion PROC:<{ + pack_proposal PROC:<{ // voters sum_weight vset_id body - NEWC // voters sum_weight vset_id body _4 - s1 s4 XCHG // body sum_weight vset_id voters _4 + s0 s3 XCHG + NEWC // body sum_weight vset_id voters _4 STDICT // body sum_weight vset_id _5 s1 s2 XCHG // body vset_id sum_weight _5 64 STU // body vset_id _7 @@ -344,31 +335,87 @@ PROGRAM{ STSLICER // _10 }> register_vote PROC:<{ - // vote_dict action cs idx weight - 2DROP // vote_dict action cs - SWAP - 1 PUSHINT // vote_dict cs action _9=1 - AND // vote_dict cs _10 - IF:<{ // vote_dict cs - DUP // vote_dict cs cs - HASHSU // vote_dict cs _11 - NIP // vote_dict hash - OVER - 8 PUSHPOW2 // vote_dict hash vote_dict _13=256 + // vote_dict action cs idx weight total_weight cur_vset_id + s0 s5 XCHG + 1 PUSHINT // vote_dict cur_vset_id cs idx weight total_weight action _13=1 + AND // vote_dict cur_vset_id cs idx weight total_weight _14 + IF:<{ // vote_dict cur_vset_id cs idx weight total_weight + s3 PUSH // vote_dict cur_vset_id cs idx weight total_weight cs + HASHSU // vote_dict cur_vset_id cs idx weight total_weight hash + s0 s6 PUSH2 + 8 PUSHPOW2 // vote_dict cur_vset_id cs idx weight total_weight hash hash vote_dict _16=256 DICTUGET - NULLSWAPIFNOT // vote_dict _23 _24 - NIP // vote_dict found? - IFNOT:<{ // vote_dict - }> // vote_dict - }>ELSE<{ // vote_dict cs - 256 PLDU // vote_dict hash - OVER - 8 PUSHPOW2 // vote_dict hash vote_dict _19=256 + NULLSWAPIFNOT // vote_dict cur_vset_id cs idx weight total_weight hash entry found? + }>ELSE<{ // vote_dict cur_vset_id cs idx weight total_weight + s3 PUSH // vote_dict cur_vset_id cs idx weight total_weight cs + 256 PLDU // vote_dict cur_vset_id cs idx weight total_weight hash + s0 s6 PUSH2 + 8 PUSHPOW2 // vote_dict cur_vset_id cs idx weight total_weight hash hash vote_dict _20=256 DICTUGET - NULLSWAPIFNOT // vote_dict _25 _26 - NIP // vote_dict found? + NULLSWAPIFNOT // vote_dict cur_vset_id cs idx weight total_weight hash entry found? + DUP // vote_dict cur_vset_id cs idx weight total_weight hash entry found? found? 42 THROWIFNOT }> + IF:<{ // vote_dict cur_vset_id cs idx weight total_weight hash entry + s5 POP // vote_dict cur_vset_id entry idx weight total_weight hash + s0 s4 XCHG // vote_dict cur_vset_id hash idx weight total_weight entry + unpack_proposal INLINECALLDICT // vote_dict cur_vset_id hash idx weight total_weight _65 _66 _67 _68 + }>ELSE<{ // vote_dict cur_vset_id cs idx weight total_weight hash entry + DROP // vote_dict cur_vset_id cs idx weight total_weight hash + PUSHNULL // vote_dict cur_vset_id cs idx weight total_weight hash _30 + s5 s0 s6 XC2PU + 0 PUSHINT + s0 s1 s3 XCHG3 // vote_dict cur_vset_id hash idx weight total_weight _65 _66 _67 _68 + }> // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight vset_id body + s1 s8 XCPU // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body vset_id cur_vset_id + NEQ // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _32 + IF:<{ // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body + NIP + PUSHNULL + s2 POP + 0 PUSHINT + SWAP // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight=0 body + }> // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body + s5 s2 PUSH2 + 16 PUSHINT // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body idx voters _37=16 + DICTUGET + NULLSWAPIFNOT // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _73 _74 + NIP // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body found? + IFJMP:<{ // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body + 8 BLKDROP // vote_dict + PUSHNULL // vote_dict _60 + }> // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body + 32 PUSHINT // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _40=32 + NEWC // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _40=32 _41 + NOW // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _40=32 _41 _42 + STUX // vote_dict cur_vset_id hash idx weight total_weight voters sum_weight body _43 + s0 s6 s3 XCHG3 + 16 PUSHINT // vote_dict cur_vset_id hash body weight total_weight sum_weight _43 idx voters _44=16 + DICTUSETB // vote_dict cur_vset_id hash body weight total_weight sum_weight voters + s0 s3 XCHG // vote_dict cur_vset_id hash body voters total_weight sum_weight weight + ADD // vote_dict cur_vset_id hash body voters total_weight sum_weight + DUP // vote_dict cur_vset_id hash body voters total_weight sum_weight sum_weight + 3 MULCONST // vote_dict cur_vset_id hash body voters total_weight sum_weight _48 + s0 s2 XCHG // vote_dict cur_vset_id hash body voters _48 sum_weight total_weight + 1 LSHIFT# // vote_dict cur_vset_id hash body voters _48 sum_weight _50 + s1 s2 XCHG // vote_dict cur_vset_id hash body voters sum_weight _48 _50 + GREATER // vote_dict cur_vset_id hash body voters sum_weight _51 + IFJMP:<{ // vote_dict cur_vset_id hash body voters sum_weight + 2DROP + 1 2 BLKDROP2 + s0 s2 XCHG + 8 PUSHPOW2 // body hash vote_dict _53=256 + DICTUDEL // body _75 _76 + DROP // body vote_dict + SWAP // vote_dict body + }> // vote_dict cur_vset_id hash body voters sum_weight + 2SWAP + s1 s4 XCHG // vote_dict hash voters sum_weight cur_vset_id body + pack_proposal INLINECALLDICT // vote_dict hash _56 + s0 s2 XCHG + 8 PUSHPOW2 // _56 hash vote_dict _57=256 + DICTUSETB // vote_dict + PUSHNULL // vote_dict _59 }> recv_external PROC:<{ // in_msg @@ -395,29 +442,49 @@ PROGRAM{ s0 s3 XCHG // signature in_msg action vote_dict public_key cfg_dict stored_seqno cs 16 LDU // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs OVER // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs idx - get_validator_descr INLINECALLDICT // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs vdescr - unpack_validator_descr INLINECALLDICT // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs val_pubkey weight - s0 s9 XCHG // signature weight action vote_dict public_key cfg_dict stored_seqno idx cs val_pubkey in_msg - HASHSU // signature weight action vote_dict public_key cfg_dict stored_seqno idx cs val_pubkey _44 - s0 s10 s10 XCHG3 // cs weight action vote_dict public_key cfg_dict stored_seqno idx _44 signature val_pubkey - CHKSIGNU // cs weight action vote_dict public_key cfg_dict stored_seqno idx _45 + get_validator_descr INLINECALLDICT // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs vdescr total_weight + SWAP // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs total_weight vdescr + unpack_validator_descr INLINECALLDICT // signature in_msg action vote_dict public_key cfg_dict stored_seqno idx cs total_weight val_pubkey weight + s0 s10 XCHG // signature weight action vote_dict public_key cfg_dict stored_seqno idx cs total_weight val_pubkey in_msg + HASHSU // signature weight action vote_dict public_key cfg_dict stored_seqno idx cs total_weight val_pubkey _45 + s0 s11 s11 XCHG3 // total_weight weight action vote_dict public_key cfg_dict stored_seqno idx cs _45 signature val_pubkey + CHKSIGNU // total_weight weight action vote_dict public_key cfg_dict stored_seqno idx cs _46 34 THROWIFNOT ACCEPT - SWAP // cs weight action vote_dict public_key cfg_dict idx stored_seqno - INC // cs weight action vote_dict public_key cfg_dict idx stored_seqno - s2 s0 s3 PUSH3 - s7 PUSH // cs weight action vote_dict public_key cfg_dict idx stored_seqno cfg_dict stored_seqno public_key vote_dict + s0 s2 XCHG // total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno + INC // total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno + s3 s0 s4 PUSH3 + s8 PUSH // total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno cfg_dict stored_seqno public_key vote_dict store_data INLINECALLDICT COMMIT - s3 s5 XCHG - s7 s1 s6 XCHG3 // cfg_dict stored_seqno public_key vote_dict action cs idx weight - register_vote CALLDICT // cfg_dict stored_seqno public_key vote_dict + 34 PUSHINT // total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno _54=34 + CONFIGOPTPARAM // total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno _55 + HASHCU // total_weight weight action vote_dict public_key cfg_dict cs idx stored_seqno _56 + s5 s7 XCHG + s3 s4 XCHG + s2 s3 XCHG + s8 s9 s0 XCHG3 // stored_seqno cfg_dict public_key vote_dict action cs idx weight total_weight _56 + register_vote CALLDICT // stored_seqno cfg_dict public_key vote_dict accepted + s3 s4 s2 PUSH3 + s4 PUSH // stored_seqno cfg_dict public_key vote_dict accepted cfg_dict stored_seqno public_key vote_dict store_data INLINECALLDICT + DUP // stored_seqno cfg_dict public_key vote_dict accepted accepted + ISNULL // stored_seqno cfg_dict public_key vote_dict accepted _59 + IFNOT:<{ // stored_seqno cfg_dict public_key vote_dict accepted + 32 LDU // stored_seqno cfg_dict public_key vote_dict _60 accepted + s3 s4 XCHG + s2 s4 XCHG // stored_seqno vote_dict cfg_dict public_key _60 accepted + perform_action CALLDICT // stored_seqno vote_dict cfg_dict public_key + s3 s0 s3 XCHG3 // cfg_dict stored_seqno public_key vote_dict + store_data INLINECALLDICT + }>ELSE<{ + 5 BLKDROP // + }> }> // signature in_msg action vote_dict cs cfg_dict stored_seqno public_key s0 s6 XCHG // signature public_key action vote_dict cs cfg_dict stored_seqno in_msg - HASHSU // signature public_key action vote_dict cs cfg_dict stored_seqno _55 - s0 s7 s6 XC2PU // stored_seqno public_key action vote_dict cs cfg_dict _55 signature public_key - CHKSIGNU // stored_seqno public_key action vote_dict cs cfg_dict _56 + HASHSU // signature public_key action vote_dict cs cfg_dict stored_seqno _66 + s0 s7 s6 XC2PU // stored_seqno public_key action vote_dict cs cfg_dict _66 signature public_key + CHKSIGNU // stored_seqno public_key action vote_dict cs cfg_dict _67 34 THROWIFNOT ACCEPT s0 s5 XCHG // cfg_dict public_key action vote_dict cs stored_seqno @@ -453,16 +520,15 @@ PROGRAM{ IF:<{ // cfg_dict cs kl=32 next_vset ds 8 LDU // cfg_dict cs kl=32 next_vset tag ds 32 PLDU // cfg_dict cs kl=32 next_vset tag since - SWAP // cfg_dict cs kl=32 next_vset since tag - 17 EQINT // cfg_dict cs kl=32 next_vset since _26 - NOW // cfg_dict cs kl=32 next_vset since _26 _27 - s1 s2 XCHG // cfg_dict cs kl=32 next_vset _26 since _27 - GEQ // cfg_dict cs kl=32 next_vset _26 _28 + NOW // cfg_dict cs kl=32 next_vset tag since _25 + LEQ // cfg_dict cs kl=32 next_vset tag _26 + SWAP // cfg_dict cs kl=32 next_vset _26 tag + 18 EQINT // cfg_dict cs kl=32 next_vset _26 _28 AND // cfg_dict cs kl=32 next_vset _29 IF:<{ // cfg_dict cs kl=32 next_vset - SWAP 34 PUSHINT - s0 s4 s4 XC2PU // kl=32 cs next_vset _32=34 cfg_dict kl=32 + ROT + s4 s4 XCPU // kl=32 cs next_vset _32=34 cfg_dict kl=32 DICTISETGETOPTREF // kl=32 cs cfg_dict cur_vset s3 s1 s0 PUXCPU // kl=32 cs cur_vset _35=32 cfg_dict kl=32 DICTISETGETOPTREF // kl=32 cs _51 _52 @@ -471,18 +537,17 @@ PROGRAM{ s0 s1 s3 XCHG3 // cs _38=36 cfg_dict kl=32 DICTIDEL // cs _53 _54 DROP // cs cfg_dict + SWAP // cfg_dict cs }>ELSE<{ - s2 s3 XCHG - 2DROP // cs cfg_dict + 2DROP // cfg_dict cs }> }>ELSE<{ - s3 s4 XCHG - 3 BLKDROP // cs cfg_dict + 3 BLKDROP // cfg_dict cs }> }>ELSE<{ - s2 s3 XCHG - 2DROP // cs cfg_dict + 2DROP // cfg_dict cs }> + SWAP NEWC // cs cfg_dict _40 STREF // cs _41 SWAP // _41 cs @@ -490,4 +555,10 @@ PROGRAM{ ENDC // _43 c4 POP }> + seqno PROC:<{ + // + c4 PUSH // _0 + CTOS // _1 + 32 PLDU // _3 + }> }END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.cpp new file mode 100644 index 0000000000..77cfbf739e --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.cpp @@ -0,0 +1 @@ +with_tvm_code("dns-auto", "te6ccgECLgEABhoAART/APSkE/S88sgLAQIBIAIDAgFIBAUBIvIw2zwxmPgAhB/4I/AD4V8ELQICzQYHAgEgGRoCASAICQIBIBMUAvdCDXScEgkl8D4AHQ0wMBcbCSXwPg+kAwIPpEA9MfIZJfBuFwIddJwj+UMNM/Ad5UFAJvA/hhIIMesJJfBeAgqxfAQ46ENFnbPOAgghByZWdkuiGCEHByb2y6qgCgIYIQdXBkZLqqAaABghBnb2djuqoCoCCWXwWEH/AF4YCgsARVAm8kCMjMF/QAFfQAyx1QA/oCUAP6AlAD+gISyx/LH8ntVIA/bbPCXQ0gcKvQnT/zBQCL0YsZpfCIIQ7m93bvAF4CeCEENoUHK6jhcwNgLTH/oA+gD6ANFvBEBEBQPwA3DwBuA0NAWCEENEZWy6jq8kbpJfBZYEA3F/8Afi2zwQRV8FbpiCEO50ZW3wBeH4QW8jghDva2F5WXCBAKDwBOAtLQwD/qPbPCbACI4ZMDU1NjYD0h8wEDUQNHEB8AeCEO9rYXnwBeAI9AQhbpsx0wUhwAACqgLXGJ0B0CDXSwGm+ICHsLEC4iKZMiB41yLXCwcC3wKaXwyCEO5vXDDwBeD4I20gcFRwBCDXSak2AorkMAHCBJtfD1uCEO92XDDwBeAswwEtDQ4ADF8FhB/wBQCEbTbTBwHAAFEzoQOONDMi10lScNcj+QKrH1MMgQDg9A5voY4ZbBLTH1MXvp3U0X4BgBD0DZE1kTDikTDiAZEw4gPeBP4kBE8TEREB2zwglQ5fDvAF4DApwwKOPQPUMCBujjV+IYAQ9A2OFdAg10mBARu+8p/XCxKCCAT+nLryn5Ew4iCAEPSEb6VsISGAEPSMb6VsIbDyn9+SMyLiJW8kI5xfD18DghDTT0ZG8AXhJBA3Wds8K8MEFbAUoA6DHaEuuYrgDyoQEQCsBG5SQLCYXwSCEO5vdGbgIm6ZXwOCEO5vLTKw4DOCEOJhZDIC0CDXSYEBG7mUECNfA+DTEgGCCAT+nL2UECNfA+BsEtIH1wv/Ar0CvbGWghDub3du4HAAFF8OghDncjxw8AUB4CnAAo5FMzhRd6BSgLyaXwuCEPNlcm/wBeBTdqDIyx/MVCCVgQDg9EMGqt9QCKAEqt9SQKBQRIMH9FswyEBEgwf0QwNFVHHwB/AG4CnAAYrgA18DBsAEjhUGyMsfFcxQcoEA4PRDUFQTcfAH8AbgXwoSAHA5OQFuml8LghDhbHJl8AXhF6AgyMsfFsxUIISBAOD0QySq31AIscgCgwf0Q1BDtggVQwRx8AfwBgIBIBUWAgEgFxgARRwgBjIywVQB88WWPoCFctqE8sfyz8hwv+Syx+RMeLJAfsAgABc+EFvIxAjcIBA8ASAAJx0+wL4QW8jghDva2F5WXCDBvAEgAPE+CMipjxSQLYJUhC5k1vwA+AyJIMH9IZvpTKTURKwjlQzIqvfUwK5jj8wIqk431MGgQDg9A5voY4S1wsfI7uZUAaBAOD0WzAFkTDikVviUCSDB/RbMCCDB/SGb6UyIZMgq9+ShB/iBqWVRRUDcALiEDYQNFnoW/ADgAgEgGxwCASAfIAENuHWts8XwOCkCAUgdHgIZs7E2zwzEDREBNs8oICkqAQ2xZrbPF8DgKwIBWCEiAT26MM+CMS2zwDlF8EcG3hkn8z3wHXSSKVWYAQ9GrgMoKwIBWCMkAgFqJygCASAlJgEQq+74I9s8XwMrAQ2nhbZ4Jr4HKQEPp6W2eCBGvgcpAQ2nx7Z4Br4HKQIPpTG2eNhFtnkpKgAo7UTQ1DH0BDH0BDHTHfoA+gD6ADAAMAKAZPlBMgTXSaoAgQDAoBSgA6YCqAKooAH2IddLIXewsfJeIJZfA3BtIW3hInjXItcLB55wyFAEzxYTywfJ0AKmCN4gwAiWXwNwbSFt4O1E0NQx9AQwbX8lBKsCjjID0wcBwACOKCDXSVJg1yP5AqsfI4EA4PQOb6GOECDXCx8mvpYyMyLXSQORMOKRMOLeA+RsIjIgLAAsbpZfA3BtIW3g0x/UMCLAAFBD1yNDMAA07UTQ1PQE9ATTHfoA+gD6AFUwbwQB0x/THzA="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.fif new file mode 100644 index 0000000000..ad75a7db5f --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-auto-code.fif @@ -0,0 +1,949 @@ +// automatically generated from `smartcont/stdlib.fc` `smartcont/dns-auto-code.fc` +PROGRAM{ + DECLPROC load_data + DECLPROC load_prices + DECLPROC store_data + DECLPROC send_message + DECLPROC send_error + DECLPROC send_ok + DECLPROC housekeeping + DECLPROC calcprice_internal + DECLPROC check_owner + DECLPROC perform_ctl_op + DECLPROC recv_internal + DECLPROC recv_external + DECLPROC dnsdictlookup + 123660 DECLMETHOD dnsresolve + 87450 DECLMETHOD getexpirationx + 110574 DECLMETHOD getexpiration + 67418 DECLMETHOD getstdperiod + 109522 DECLMETHOD getppr + 108994 DECLMETHOD getppc + 113123 DECLMETHOD getppb + 113304 DECLMETHOD calcprice + 85700 DECLMETHOD calcregprice + DECLGLOBVAR query_info + load_data PROCREF:<{ + // + c4 PUSH // _1 + CTOS // cs + LDREF // _3 cs + LDDICT // _3 _5 cs + LDDICT // _3 _5 _7 cs + 30 LDU // _3 _5 _7 _10 cs + LDGRAMS // _3 _5 _7 _10 _13 cs + LDGRAMS // _3 _5 _7 _10 _13 _15 cs + LDGRAMS // _3 _5 _7 _10 _13 _15 _17 cs + 4 -ROLL // _3 _5 _7 cs _10 _13 _15 _17 + 4 TUPLE // _3 _5 _7 cs _9 + SWAP // _3 _5 _7 _9 cs + 32 LDU // _3 _5 _7 _9 _19 cs + 32 LDU // _3 _5 _7 _9 _19 _42 _41 + DROP // _3 _5 _7 _9 _19 _22 + }> + load_prices PROCREF:<{ + // + c4 PUSH // _1 + CTOS // cs + LDREF // _19 _18 + NIP // cs + LDDICT // _21 _20 + NIP // cs + LDDICT // _23 _22 + NIP // cs + 30 LDU // _9 cs + LDGRAMS // _9 _12 cs + LDGRAMS // _9 _12 _14 cs + LDGRAMS // _9 _12 _14 _31 _30 + DROP // _9 _12 _14 _16 + }> + store_data PROC:<{ + // ctl dd gc prices nhk lhk + s0 s2 XCHG // ctl dd gc lhk nhk prices + 4 UNTUPLE // ctl dd gc lhk nhk sp ppr ppc ppb + s0 s8 XCHG + NEWC // ppb dd gc lhk nhk sp ppr ppc ctl _11 + STREF // ppb dd gc lhk nhk sp ppr ppc _12 + s1 s7 XCHG // ppb ppc gc lhk nhk sp ppr dd _12 + STDICT // ppb ppc gc lhk nhk sp ppr _13 + s1 s5 XCHG // ppb ppc ppr lhk nhk sp gc _13 + STDICT // ppb ppc ppr lhk nhk sp _14 + 30 STU // ppb ppc ppr lhk nhk _16 + s0 s3 XCHG2 // ppb ppc nhk lhk _16 ppr + STGRAMS // ppb ppc nhk lhk _17 + s0 s3 XCHG2 // ppb lhk nhk _17 ppc + STGRAMS // ppb lhk nhk _18 + s0 s3 XCHG2 // nhk lhk _18 ppb + STGRAMS // nhk lhk _19 + s1 s2 XCHG // lhk nhk _19 + 32 STU // lhk _21 + 32 STU // _23 + ENDC // _24 + c4 POP + }> + send_message PROC:<{ + // addr tag query_id body grams mode + 0 PUSHINT // addr tag query_id body grams mode _7=0 + 24 PUSHINT // addr tag query_id body grams mode _7=0 _8=24 + NEWC // addr tag query_id body grams mode _7=0 _8=24 _9 + 6 STU // addr tag query_id body grams mode _7=0 _11 + s0 s7 XCHG2 // _7=0 tag query_id body grams mode _11 addr + STSLICER // _7=0 tag query_id body grams mode _12 + ROT // _7=0 tag query_id body mode _12 grams + STGRAMS // _7=0 tag query_id body mode _13 + s1 s5 XCHG // mode tag query_id body _7=0 _13 + 107 STU // mode tag query_id body _27 + s1 s3 XCHG // mode body query_id tag _27 + 32 STU // mode body query_id _29 + 64 STU // mode body msg + OVER // mode body msg body + -1 GTINT // mode body msg _33 + IF:<{ // mode body msg + 32 STU // mode msg + }>ELSE<{ + NIP // mode msg + }> + ENDC // mode _37 + SWAP // _37 mode + SENDRAWMSG + }> + send_error PROC:<{ + // error_code + query_info GETGLOB + UNTRIPLE // error_code addr query_id op + s2 s3 XCHG + 0 PUSHINT + 64 PUSHINT // addr error_code query_id op _5=0 _6=64 + send_message CALLDICT + }> + send_ok PROC:<{ + // price + 4 PUSHINT // price _1=4 + RAWRESERVE + query_info GETGLOB + UNTRIPLE // addr query_id op + 4016791929 PUSHINT // addr query_id op _7=4016791929 + -ROT + 0 PUSHINT + 7 PUSHPOW2 // addr _7=4016791929 query_id op _8=0 _9=128 + send_message CALLDICT + }> + housekeeping PROC:<{ + // ctl dd gc prices nhk lhk max_steps + NOW // ctl dd gc prices nhk lhk max_steps n + s2 PUSH // ctl dd gc prices nhk lhk max_steps n lhk + 60 ADDCONST // ctl dd gc prices nhk lhk max_steps n _10 + s4 s(-1) PUXC // ctl dd gc prices nhk lhk max_steps n nhk _10 + MAX // ctl dd gc prices nhk lhk max_steps n _11 + s1 s(-1) PUXC // ctl dd gc prices nhk lhk max_steps n n _11 + LESS // ctl dd gc prices nhk lhk max_steps n _12 + IFJMP:<{ // ctl dd gc prices nhk lhk max_steps n + 2DROP // ctl dd gc prices nhk lhk + store_data CALLDICT + }> // ctl dd gc prices nhk lhk max_steps n + s2 POP // ctl dd gc prices nhk n max_steps + s4 PUSH + 8 PUSHPOW2 // ctl dd gc prices nhk n max_steps gc _17=256 + DICTUMIN + NULLSWAPIFNOT2 // ctl dd gc prices nhk n max_steps _63 _62 _64 + s2 POP // ctl dd gc prices nhk n max_steps found? mkey + WHILE:<{ + s1 s2 XCPU // ctl dd gc prices nhk n max_steps mkey found? max_steps + AND // ctl dd gc prices nhk n max_steps mkey _19 + }>DO<{ // ctl dd gc prices nhk n max_steps mkey + s3 POP // ctl dd gc prices mkey n max_steps + s2 PUSH // ctl dd gc prices mkey n max_steps mkey + 224 RSHIFT# // ctl dd gc prices mkey n max_steps nhk + s0 s2 PUSH2 // ctl dd gc prices mkey n max_steps nhk nhk n + LESS // ctl dd gc prices mkey n max_steps nhk _24 + IF:<{ // ctl dd gc prices mkey n max_steps nhk + DROP // ctl dd gc prices mkey n max_steps + s2 PUSH // ctl dd gc prices mkey n max_steps mkey + 224 MODPOW2# // ctl dd gc prices mkey n max_steps key + s0 s6 PUSH2 + 224 PUSHINT // ctl dd gc prices mkey n max_steps key key dd _35 + DICTUGET + NULLSWAPIFNOT // ctl dd gc prices mkey n max_steps key val found? + IF:<{ // ctl dd gc prices mkey n max_steps key val + 32 PLDU // ctl dd gc prices mkey n max_steps key exp + s3 PUSH // ctl dd gc prices mkey n max_steps key exp n + LEQ // ctl dd gc prices mkey n max_steps key _40 + IF:<{ // ctl dd gc prices mkey n max_steps key + s0 s6 XCHG2 + 224 PUSHINT // ctl max_steps gc prices mkey n key dd _44 + DICTUDEL // ctl max_steps gc prices mkey n _67 _68 + DROP // ctl max_steps gc prices mkey n dd + s0 s5 XCHG // ctl dd gc prices mkey n max_steps + }>ELSE<{ + DROP // ctl dd gc prices mkey n max_steps + }> + }>ELSE<{ + 2DROP // ctl dd gc prices mkey n max_steps + }> + s2 s4 XCHG2 + 8 PUSHPOW2 // ctl dd max_steps prices n mkey gc _47=256 + DICTUDEL // ctl dd max_steps prices n _69 _70 + DROP // ctl dd max_steps prices n gc + DUP + 8 PUSHPOW2 // ctl dd max_steps prices n gc gc _50=256 + DICTUMIN + NULLSWAPIFNOT2 // ctl dd max_steps prices n gc _72 _71 _73 + s2 POP // ctl dd max_steps prices n gc found? mkey + OVER // ctl dd max_steps prices n gc found? mkey found? + IF:<{ // ctl dd max_steps prices n gc found? mkey + DUP // ctl dd max_steps prices n gc found? mkey mkey + 224 RSHIFT# // ctl dd max_steps prices n gc found? mkey _52 + }>ELSE<{ // ctl dd max_steps prices n gc found? mkey + 32 PUSHPOW2DEC // ctl dd max_steps prices n gc found? mkey _52=4294967295 + }> // ctl dd max_steps prices n gc found? mkey nhk + s0 s6 XCHG // ctl dd nhk prices n gc found? mkey max_steps + DEC // ctl dd nhk prices n gc found? mkey max_steps + }>ELSE<{ // ctl dd gc prices mkey n max_steps nhk + s5 s1 s5 XCHG3 + s0 s3 XCHG + FALSE + s0 s2 XCHG // ctl dd nhk prices n gc found? mkey max_steps + }> + s3 s6 XCHG + s3 s4 XCHG + -ROT // ctl dd gc prices nhk n max_steps found? mkey + }> // ctl dd gc prices nhk n max_steps mkey + 2DROP // ctl dd gc prices nhk n + store_data CALLDICT + }> + calcprice_internal PROCREF:<{ + // domain data ppc ppb + s0 s2 XCHG + 100 PUSHINT // domain ppb ppc data _7=100 + CDATASIZE // domain ppb ppc _24 _25 _26 + s2 POP // domain ppb ppc refs bits + s0 s4 XCHG // bits ppb ppc refs domain + SBITS // bits ppb ppc refs _9 + 1 LSHIFT# // bits ppb ppc refs _11 + 192 PUSHINT // bits ppb ppc refs _11 _16 + ADD // bits ppb ppc refs _17 + s1 s4 XCHG // refs ppb ppc bits _17 + ADD // refs ppb ppc bits + s0 s3 XCHG // bits ppb ppc refs + 2 ADDCONST // bits ppb ppc _20 + MUL // bits ppb _21 + s0 s2 XCHG // _21 ppb bits + MUL // _21 _22 + ADD // _23 + }> + check_owner PROCREF:<{ + // cat_table owner_info src_wc src_addr strict + s0 s4 XCHG // strict owner_info src_wc src_addr cat_table + ISNULL // strict owner_info src_wc src_addr _5 + s4 s(-1) PUXC // strict owner_info src_wc src_addr strict _5 + AND // strict owner_info src_wc src_addr _6 + IFJMP:<{ // strict owner_info src_wc src_addr + 4 BLKDROP // + 4000281702 PUSHINT // _7=4000281702 + }> // strict owner_info src_wc src_addr + s2 PUSH // strict owner_info src_wc src_addr owner_info + ISNULL // strict owner_info src_wc src_addr _8 + IFJMP:<{ // strict owner_info src_wc src_addr + 3 BLKDROP // strict + 4000263474 PUSHINT // strict _9=4000263474 + AND // _10 + }> // strict owner_info src_wc src_addr + s3 POP // src_addr owner_info src_wc + 3798033458 PUSHINT // src_addr owner_info src_wc ERR_BAD2=3798033458 + s0 s2 XCHG // src_addr ERR_BAD2=3798033458 src_wc owner_info + CTOS // src_addr ERR_BAD2=3798033458 src_wc sown + DUP // src_addr ERR_BAD2=3798033458 src_wc sown sown + SBITS // src_addr ERR_BAD2=3798033458 src_wc sown _15 + 283 PUSHINT // src_addr ERR_BAD2=3798033458 src_wc sown _15 _22 + LESS // src_addr ERR_BAD2=3798033458 src_wc sown _23 + IFJMP:<{ // src_addr ERR_BAD2=3798033458 src_wc sown + s2 s3 XCHG + 3 BLKDROP // ERR_BAD2=3798033458 + }> // src_addr ERR_BAD2=3798033458 src_wc sown + 19 LDU // src_addr ERR_BAD2=3798033458 src_wc _24 sown + SWAP + 327324 PUSHINT // src_addr ERR_BAD2=3798033458 src_wc sown _24 _33 + NEQ // src_addr ERR_BAD2=3798033458 src_wc sown _34 + IFJMP:<{ // src_addr ERR_BAD2=3798033458 src_wc sown + s2 s3 XCHG + 3 BLKDROP // ERR_BAD2=3798033458 + }> // src_addr ERR_BAD2=3798033458 src_wc sown + 1 2 BLKDROP2 // src_addr src_wc sown + 8 LDI // src_addr src_wc _37 sown + 256 PLDU // src_addr src_wc owner_wc owner_addr + s0 s2 XCHG // src_addr owner_addr owner_wc src_wc + NEQ // src_addr owner_addr _42 + s0 s2 XCHG // _42 owner_addr src_addr + NEQ // _42 _43 + OR // _44 + IFJMP:<{ // + 4000282478 PUSHINT // _45=4000282478 + }> // + 0 PUSHINT // _46=0 + }> + perform_ctl_op PROCREF:<{ + // op src_wc src_addr in_msg + load_data INLINECALLDICT // op src_wc src_addr in_msg ctl domdata gc prices nhk lhk + s5 PUSH // op src_wc src_addr in_msg ctl domdata gc prices nhk lhk ctl + CTOS // op src_wc src_addr in_msg ctl domdata gc prices nhk lhk cs + 8 LDI // op src_wc src_addr in_msg ctl domdata gc prices nhk lhk _13 cs + s0 s10 XCHG // op cs src_addr in_msg ctl domdata gc prices nhk lhk _13 src_wc + NEQ // op cs src_addr in_msg ctl domdata gc prices nhk lhk _16 + s0 s9 XCHG // op _16 src_addr in_msg ctl domdata gc prices nhk lhk cs + 256 LDU // op _16 src_addr in_msg ctl domdata gc prices nhk lhk _75 _74 + DROP // op _16 src_addr in_msg ctl domdata gc prices nhk lhk _17 + s0 s8 XCHG2 // op _16 lhk in_msg ctl domdata gc prices nhk _17 src_addr + NEQ // op _16 lhk in_msg ctl domdata gc prices nhk _20 + s1 s8 XCHG // op nhk lhk in_msg ctl domdata gc prices _16 _20 + OR // op nhk lhk in_msg ctl domdata gc prices _21 + IFJMP:<{ // op nhk lhk in_msg ctl domdata gc prices + 8 BLKDROP // + 4000282478 PUSHINT // _22=4000282478 + send_error CALLDICT + }> // op nhk lhk in_msg ctl domdata gc prices + s7 PUSH + 1130909810 PUSHINT // op nhk lhk in_msg ctl domdata gc prices op _24=1130909810 + EQUAL // op nhk lhk in_msg ctl domdata gc prices _25 + IFJMP:<{ // op nhk lhk in_msg ctl domdata gc prices + DROP + s6 POP // gc nhk lhk in_msg ctl domdata + s0 s2 XCHG // gc nhk lhk domdata ctl in_msg + 32 LDU // gc nhk lhk domdata ctl _30 in_msg + LDGRAMS // gc nhk lhk domdata ctl _30 _33 in_msg + LDGRAMS // gc nhk lhk domdata ctl _30 _33 _35 in_msg + LDGRAMS // gc nhk lhk domdata ctl stdper ppr ppc ppb in_msg + ENDS + 4 TUPLE // gc nhk lhk domdata ctl _40 + s0 s4 s4 XCHG3 + s0 s5 XCHG + s0 s3 XCHG // ctl domdata gc _40 nhk lhk + store_data CALLDICT + 0 PUSHINT // _42=0 + send_ok CALLDICT + }> // op nhk lhk in_msg ctl domdata gc prices + s4 POP + s4 POP // op nhk gc prices ctl domdata + s0 s5 XCHG + 1128555884 PUSHINT // domdata nhk gc prices ctl op _44=1128555884 + EQUAL // domdata nhk gc prices ctl _45 + IFJMP:<{ // domdata nhk gc prices ctl + s4 PUSH // domdata nhk gc prices ctl domdata + ISNULL // domdata nhk gc prices ctl _46 + IFNOT:<{ // domdata nhk gc prices ctl + s0 s4 XCHG + s0 s3 XCHG + 1 PUSHINT + -1 PUSHINT // ctl domdata gc prices nhk _47=1 _48=-1 + housekeeping CALLDICT + }>ELSE<{ + 5 BLKDROP // + }> + load_data INLINECALLDICT // _84 _85 _86 _87 _88 _89 + s4 s5 XCHG + 5 BLKDROP // domdata + ISNULL // _51 + IFNOTJMP:<{ // + 4000605549 PUSHINT // _52=4000605549 + send_error CALLDICT + }> // + query_info GETGLOB + UNTRIPLE // addr query_id op + 4016791929 PUSHINT // addr query_id op _58=4016791929 + -ROT + 0 PUSHINT + 160 PUSHINT // addr _58=4016791929 query_id op _59=0 _62 + send_message CALLDICT + }> // domdata nhk gc prices ctl + 5 BLKDROP // + 32 PUSHPOW2DEC // _64=4294967295 + send_error CALLDICT + }> + recv_internal PROC:<{ + // msg_value in_msg_cell in_msg + DUP // msg_value in_msg_cell in_msg in_msg + SBITS // msg_value in_msg_cell in_msg _3 + 32 LESSINT // msg_value in_msg_cell in_msg _5 + IFJMP:<{ // msg_value in_msg_cell in_msg + 3 BLKDROP // + }> // msg_value in_msg_cell in_msg + SWAP // msg_value in_msg in_msg_cell + CTOS // msg_value in_msg cs + 4 LDU // msg_value in_msg flags cs + SWAP + 1 PUSHINT // msg_value in_msg cs flags _12=1 + AND // msg_value in_msg cs _13 + IFJMP:<{ // msg_value in_msg cs + 3 BLKDROP // + }> // msg_value in_msg cs + LDMSGADDR // msg_value in_msg _327 _326 + DROP // msg_value in_msg s_addr + DUP // msg_value in_msg s_addr s_addr + REWRITESTDADDR // msg_value in_msg s_addr src_wc src_addr + s0 s3 XCHG // msg_value src_addr s_addr src_wc in_msg + 32 LDU // msg_value src_addr s_addr src_wc op in_msg + OVER // msg_value src_addr s_addr src_wc op in_msg op + IFNOTJMP:<{ // msg_value src_addr s_addr src_wc op in_msg + 6 BLKDROP // + }> // msg_value src_addr s_addr src_wc op in_msg + 0 PUSHINT // msg_value src_addr s_addr src_wc op in_msg query_id=0 + OVER // msg_value src_addr s_addr src_wc op in_msg query_id=0 in_msg + SBITS // msg_value src_addr s_addr src_wc op in_msg query_id=0 _26 + 63 GTINT // msg_value src_addr s_addr src_wc op in_msg query_id=0 _28 + IF:<{ // msg_value src_addr s_addr src_wc op in_msg query_id=0 + DROP // msg_value src_addr s_addr src_wc op in_msg + 64 LDU // msg_value src_addr s_addr src_wc op query_id in_msg + SWAP // msg_value src_addr s_addr src_wc op in_msg query_id + }> // msg_value src_addr s_addr src_wc op in_msg query_id + s4 s0 s2 XC2PU // msg_value src_addr in_msg src_wc op s_addr query_id op + TRIPLE + query_info SETGLOB + DUP + 31 PUSHPOW2 // msg_value src_addr in_msg src_wc op op _34 + AND // msg_value src_addr in_msg src_wc op _35 + IFJMP:<{ // msg_value src_addr in_msg src_wc op + 5 BLKDROP // + }> // msg_value src_addr in_msg src_wc op + DUP // msg_value src_addr in_msg src_wc op op + 24 RSHIFT# // msg_value src_addr in_msg src_wc op _37 + 67 EQINT // msg_value src_addr in_msg src_wc op _39 + IFJMP:<{ // msg_value src_addr in_msg src_wc op + s4 POP // op src_addr in_msg src_wc + -ROT // op src_wc src_addr in_msg + perform_ctl_op INLINECALLDICT + }> // msg_value src_addr in_msg src_wc op + DUP + 1919248228 PUSHINT // msg_value src_addr in_msg src_wc op op _42=1919248228 + EQUAL // msg_value src_addr in_msg src_wc op _45 + OVER + 1886547820 PUSHINT // msg_value src_addr in_msg src_wc op _45 op _46=1886547820 + EQUAL // msg_value src_addr in_msg src_wc op _45 _47 + 1 LSHIFT# // msg_value src_addr in_msg src_wc op _45 _49 + ADD // msg_value src_addr in_msg src_wc op _50 + OVER + 1970300004 PUSHINT // msg_value src_addr in_msg src_wc op _50 op _51=1970300004 + EQUAL // msg_value src_addr in_msg src_wc op _50 _52 + 2 LSHIFT# // msg_value src_addr in_msg src_wc op _50 _54 + ADD // msg_value src_addr in_msg src_wc op _55 + SWAP + 1735354211 PUSHINT // msg_value src_addr in_msg src_wc _55 op _56=1735354211 + EQUAL // msg_value src_addr in_msg src_wc _55 _57 + 3 LSHIFT# // msg_value src_addr in_msg src_wc _55 _59 + ADD // msg_value src_addr in_msg src_wc qt + DUP // msg_value src_addr in_msg src_wc qt qt + IFNOTJMP:<{ // msg_value src_addr in_msg src_wc qt + 5 BLKDROP // + 32 PUSHPOW2DEC // _61=4294967295 + send_error CALLDICT + }> // msg_value src_addr in_msg src_wc qt + NEGATE // msg_value src_addr in_msg src_wc qt + load_data INLINECALLDICT // msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk + s6 PUSH // msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk qt + 8 EQINT // msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk _72 + IFJMP:<{ // msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk + DROP + s5 POP + s5 POP + s6 POP + s6 POP // domdata gc in_msg prices nhk ctl + s0 s3 XCHG // domdata gc ctl prices nhk in_msg + 32 LDI // domdata gc ctl prices nhk _341 _340 + DROP // domdata gc ctl prices nhk max_steps + s3 s5 XCHG + s3 s4 XCHG + 1 PUSHINT + SWAP // ctl domdata gc prices nhk _77=1 max_steps + housekeeping CALLDICT + 4016791929 PUSHINT // _79=4016791929 + send_error CALLDICT + }> // msg_value src_addr in_msg src_wc qt ctl domdata gc prices nhk lhk + s0 s8 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg + LDOPTREF // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg + OVER // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg domain_cell + ISNULL // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg _88 + IF:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg + NIP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg + 6 LDU // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk bytes in_msg + OVER // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk bytes in_msg bytes + 0 EQINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk bytes in_msg fail + s0 s2 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail in_msg bytes + 3 LSHIFT# // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail in_msg _97 + LDSLICEX // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg + }>ELSE<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk domain_cell in_msg + SWAP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain_cell + CTOS // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain + DUP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain domain + SBITREFS // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain bits refs + SWAP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs bits + -8 ADDCONST // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs _104 + -121 PUSHINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs _104 _107 + AND // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain refs _108 + OR // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain fail + s0 s2 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg + }> + s2 PUSH // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg fail + IFNOT:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg + s2 POP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain + DUP + 8 PUSHINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain domain _110=8 + SDCUTLAST // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain _111 + 8 PLDU // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain fail + s0 s2 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg + }> // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk fail domain in_msg + s0 s2 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain fail + IFJMP:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain + 12 BLKDROP // + 4000275504 PUSHINT // _114=4000275504 + send_error CALLDICT + }> // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain + NOW // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n + PUSHNULL // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n _120 + DUP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info + 0 PUSHINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info _124=0 + s0 s0 s4 PUSH3 // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail + DUP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail tail + SBITS // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail _126 + 3 RSHIFTC# // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key=0 zeros=0 exp=0 tail _128 + REPEAT:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail + PUSHNULL + s6 POP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail + 8 LDU // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp _131 tail + SWAP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail _131 + 0 EQINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail z + s3 s3 XCPU // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key z exp tail zeros z + SUB // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key z exp tail zeros + s0 s3 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail z + IF:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail + s3 POP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp + s2 PUSH // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp tail + SBITS // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp _137 + s7 s(-1) PUXC // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp domain _137 + SDSKIPLAST // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp _138 + SHA256U // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp _139 + 32 RSHIFT# // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key + s0 s12 PUSH2 + 224 PUSHINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key key domdata _146 + DICTUGET + NULLSWAPIFNOT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key val found? + IF:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key val + 1 2 BLKDROP2 // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key val + 32 LDU // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val + s1 s7 PUSH2 // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val exp n + GEQ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val _151 + IF:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp val + LDREF // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cat_table val + ENDS + -2 PUSHINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cat_table _158=-2 + SWAP + 16 PUSHINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp _158=-2 cat_table _159=16 + DICTIGETREF // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cown ok + IF:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp cown + s5 POP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp + }>ELSE<{ + DROP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp + }> + }>ELSE<{ + DROP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros key exp + }> + SWAP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key + }>ELSE<{ + DROP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info tail zeros exp key + }> + s0 s3 XCHG // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail + }> // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp tail + }> + DROP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key zeros exp + SWAP // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp zeros + 4 GTINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp _162 + IFJMP:<{ // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp + 15 BLKDROP + 2DROP // + 4017511472 PUSHINT // _163=4017511472 + send_error CALLDICT + }> // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp + s12 PUSH // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp qt + 1 NEQINT // msg_value src_addr lhk src_wc qt ctl domdata gc prices nhk in_msg domain n cat_table owner_info key exp _167 + s4 PUSH + s0 s4 XCHG + s15 s1 s3 XCHG3 + s0 17 s() XCHG + SWAP // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table cat_table owner_info src_wc src_addr _167 + check_owner INLINECALLDICT // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err + DUP // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err err + IFJMP:<{ // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err + s0 s14 XCHG + 14 BLKDROP // err + send_error CALLDICT + }> // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table err + DROP // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table + s9 PUSH // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table qt + 2 NEQINT // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table _173 + IF:<{ // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table + s0 s3 XCHG // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n in_msg + LDREF // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n _361 _360 + DROP // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data + DUP // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data data + DICTEMPTY // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _176 + IFNOT:<{ // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data + -2 PUSHINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _179=-2 + OVER + 16 PUSHINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _179=-2 data _180=16 + DICTIGETREF // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data oinfo ok + IF:<{ // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data oinfo + CTOS // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs + DUP // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs cs + SBITS // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs _185 + 283 PUSHINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs _185 _192 + GEQ // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data cs _193 + 31 THROWIFNOT + 19 PLDU // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _197 + 327324 PUSHINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _197 _202 + EQUAL // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _203 + 31 THROWIFNOT + }>ELSE<{ + DROP // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data + }> + DUP + 16 PUSHINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data data _208=16 + DICTIMIN + NULLSWAPIFNOT2 // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _365 _364 _366 + 2 1 BLKDROP2 // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok + OVER + 16 PUSHINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok data _213=16 + DICTIMAX + NULLSWAPIFNOT2 // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok _368 _367 _369 + 2 1 BLKDROP2 // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data minok maxok + AND // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data _216 + 31 THROWIFNOT + }> // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data + }>ELSE<{ // msg_value key lhk exp qt ctl domdata gc prices nhk in_msg domain n cat_table + s3 POP // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n + s2 PUSH // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data + }> + s5 PUSH // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data prices + 4 UNTUPLE // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb + s3 PUSH // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb stdper + IFNOTJMP:<{ // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb + 15 BLKDROP + 3 BLKDROP // + 3545187910 PUSHINT // _223=3545187910 + send_error CALLDICT + }> // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table domain n data stdper ppr ppc ppb + s4 PUSH + s3 s7 XCHG + -ROT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper domain data ppc ppb + calcprice_internal INLINECALLDICT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper _226 + s11 PUSH // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper _226 qt + 4 NEQINT // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table ppr n data stdper _226 _228 + s1 s5 XCHG // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table _226 n data stdper ppr _228 + AND // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table _226 n data stdper _229 + s1 s4 XCHG // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _226 _229 + ADD // msg_value key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data price + s0 s14 XCHG + 30 PUSHPOW2 // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data msg_value _233 + SUB // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _234 + s14 PUSH // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _234 price + LESS // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _235 + IFJMP:<{ // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data + 14 BLKDROP // + 3883023472 PUSHINT // _236=3883023472 + send_error CALLDICT + }> // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data + s9 PUSH // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data qt + 2 EQINT // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _243 + IFJMP:<{ // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data + s3 POP + s8 POP // price key lhk exp n ctl domdata gc prices nhk data stdper + s7 s7 XCPU // price key lhk exp stdper ctl domdata gc prices nhk data n stdper + ADD // price key lhk exp stdper ctl domdata gc prices nhk data _244 + s8 s(-1) PUXC // price key lhk exp stdper ctl domdata gc prices nhk data exp _244 + GREATER // price key lhk exp stdper ctl domdata gc prices nhk data _245 + IFJMP:<{ // price key lhk exp stdper ctl domdata gc prices nhk data + 11 BLKDROP // + 4083511919 PUSHINT // _246=4083511919 + send_error CALLDICT + }> // price key lhk exp stdper ctl domdata gc prices nhk data + s7 s6 PUSH2 // price key lhk exp stdper ctl domdata gc prices nhk data exp stdper + ADD // price key lhk exp stdper ctl domdata gc prices nhk data _249 + NEWC // price key lhk exp stdper ctl domdata gc prices nhk data _249 _250 + 32 STU // price key lhk exp stdper ctl domdata gc prices nhk data _252 + STREF // price key lhk exp stdper ctl domdata gc prices nhk _253 + s0 s9 s4 XCPUXC + 224 PUSHINT // price key lhk exp stdper ctl nhk gc prices _253 key domdata _256 + DICTUSETB // price key lhk exp stdper ctl nhk gc prices domdata + s0 s6 XCHG // price key lhk domdata stdper ctl nhk gc prices exp + 224 LSHIFT# // price key lhk domdata stdper ctl nhk gc prices _262 + s0 s8 XCHG2 // price prices lhk domdata stdper ctl nhk gc _262 key + ADD // price prices lhk domdata stdper ctl nhk gc gckeyO + s0 s4 XCHG // price prices lhk domdata gckeyO ctl nhk gc stdper + 224 LSHIFT# // price prices lhk domdata gckeyO ctl nhk gc _268 + s4 s(-1) PUXC // price prices lhk domdata gckeyO ctl nhk gc gckeyO _268 + ADD // price prices lhk domdata gckeyO ctl nhk gc gckeyN + s4 s4 XCHG2 + 8 PUSHPOW2 // price prices lhk domdata gckeyN ctl nhk gckeyO gc _271=256 + DICTUDEL // price prices lhk domdata gckeyN ctl nhk _376 _377 + DROP // price prices lhk domdata gckeyN ctl nhk gc + NEWC // price prices lhk domdata gckeyN ctl nhk gc _274 + s0 s4 s4 XCHG3 + 8 PUSHPOW2 // price prices lhk domdata nhk ctl _274 gckeyN gc _275=256 + DICTUSETB // price prices lhk domdata nhk ctl gc + s0 s3 XCHG + s5 s5 s4 XCHG3 + 1 PUSHINT // price ctl domdata gc prices nhk lhk _277=1 + housekeeping CALLDICT + send_ok CALLDICT + }> // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data + s9 PUSH // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data qt + 1 EQINT // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data _281 + IFJMP:<{ // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data + s9 POP + s9 POP // price key lhk n data ctl domdata gc prices nhk cat_table stdper + SWAP // price key lhk n data ctl domdata gc prices nhk stdper cat_table + ISNULL // price key lhk n data ctl domdata gc prices nhk stdper _282 + IFNOTJMP:<{ // price key lhk n data ctl domdata gc prices nhk stdper + 11 BLKDROP // + 3781980773 PUSHINT // _283=3781980773 + send_error CALLDICT + }> // price key lhk n data ctl domdata gc prices nhk stdper + s1 s7 XCHG // price key lhk nhk data ctl domdata gc prices n stdper + ADD // price key lhk nhk data ctl domdata gc prices expires_at + DUP + NEWC // price key lhk nhk data ctl domdata gc prices expires_at expires_at _288 + 32 STU // price key lhk nhk data ctl domdata gc prices expires_at _290 + s1 s6 XCHG // price key lhk nhk expires_at ctl domdata gc prices data _290 + STREF // price key lhk nhk expires_at ctl domdata gc prices _291 + s0 s8 s3 XCPUXC + 224 PUSHINT // price key lhk nhk expires_at ctl prices gc _291 key domdata _294 + DICTUSETB // price key lhk nhk expires_at ctl prices gc domdata + s4 PUSH // price key lhk nhk expires_at ctl prices gc domdata expires_at + 224 LSHIFT# // price key lhk nhk expires_at ctl prices gc domdata _300 + s0 s8 XCHG2 // price domdata lhk nhk expires_at ctl prices gc _300 key + OR // price domdata lhk nhk expires_at ctl prices gc gckey + NEWC // price domdata lhk nhk expires_at ctl prices gc gckey _303 + s0 s2 XCHG + 8 PUSHPOW2 // price domdata lhk nhk expires_at ctl prices _303 gckey gc _304=256 + DICTUSETB // price domdata lhk nhk expires_at ctl prices gc + s4 s3 XCHG2 // price domdata lhk prices gc ctl nhk expires_at + MIN // price domdata lhk prices gc ctl _306 + s1 s5 XCHG + s3 s0 s4 XCHG3 + 1 PUSHINT // price ctl domdata gc prices _306 lhk _307=1 + housekeeping CALLDICT + send_ok CALLDICT + }> // price key lhk exp qt ctl domdata gc prices nhk cat_table stdper n data + s0 s3 XCHG + 3 BLKDROP // price key lhk exp qt ctl domdata gc prices nhk data + s0 s6 XCHG // price key lhk exp data ctl domdata gc prices nhk qt + 4 EQINT // price key lhk exp data ctl domdata gc prices nhk _311 + IFJMP:<{ // price key lhk exp data ctl domdata gc prices nhk + s0 s6 XCHG + NEWC // price key lhk nhk data ctl domdata gc prices exp _313 + 32 STU // price key lhk nhk data ctl domdata gc prices _315 + s1 s5 XCHG // price key lhk nhk prices ctl domdata gc data _315 + STREF // price key lhk nhk prices ctl domdata gc _316 + s7 s2 XCHG2 + 224 PUSHINT // price gc lhk nhk prices ctl _316 key domdata _319 + DICTUSETB // price gc lhk nhk prices ctl domdata + s5 s4 XCHG2 + s1 s3 XCHG + 1 PUSHINT // price ctl domdata gc prices nhk lhk _321=1 + housekeeping CALLDICT + send_ok CALLDICT + }> // price key lhk exp data ctl domdata gc prices nhk + 10 BLKDROP // + }> + recv_external PROC:<{ + // in_msg + DROP // + load_data INLINECALLDICT // _12 _13 _14 _15 _16 _17 + NIP // ctl dd gc prices lhk + IFNOTJMP:<{ // ctl dd gc prices + ACCEPT + 32 PUSHPOW2DEC // ctl dd gc prices _9=4294967295 + NOW // ctl dd gc prices _9=4294967295 _10 + store_data CALLDICT + }> // ctl dd gc prices + 4 BLKDROP // + }> + dnsdictlookup PROCREF:<{ + // domain nowtime + OVER // domain nowtime domain + SBITREFS // domain nowtime bits refs + OVER + 7 PUSHINT // domain nowtime bits refs bits _6=7 + AND // domain nowtime bits refs _7 + OR // domain nowtime bits _8 + 30 THROWIF + DUP // domain nowtime bits bits + IFNOTJMP:<{ // domain nowtime bits + 3 BLKDROP // + 0 PUSHINT // _10=0 + PUSHNULL // _10=0 _11 + OVER // _10=0 _11 _12=0 + PUSHNULL // _10=0 _11 _12=0 _13 + }> // domain nowtime bits + s2 PUSH + 8 PUSHINT // domain nowtime bits domain _15=8 + SDCUTLAST // domain nowtime bits _16 + 8 PLDU // domain nowtime bits domain_last_byte + IF:<{ // domain nowtime bits + 0 PUSHINT // domain nowtime bits _19=0 + NEWC // domain nowtime bits _19=0 _20 + s0 s4 XCHG2 // _19=0 nowtime bits _20 domain + STSLICER // _19=0 nowtime bits _21 + s1 s3 XCHG // bits nowtime _19=0 _21 + 8 STU // bits nowtime _23 + ENDC // bits nowtime _24 + CTOS // bits nowtime domain + s0 s2 XCHG // domain nowtime bits + 8 ADDCONST // domain nowtime bits + }> // domain nowtime bits + DUP // domain nowtime bits bits + 8 EQINT // domain nowtime bits _29 + IFJMP:<{ // domain nowtime bits + 3 BLKDROP // + 0 PUSHINT // _30=0 + PUSHNULL // _30=0 _31 + OVER // _30=0 _31 _32=0 + PUSHNULL // _30=0 _31 _32=0 _33 + }> // domain nowtime bits + c4 PUSH // domain nowtime bits _35 + CTOS // domain nowtime bits ds + LDREF // domain nowtime bits _87 _86 + NIP // domain nowtime bits ds + LDDICT // domain nowtime bits _89 _88 + DROP // domain nowtime bits root + PUSHNULL // domain nowtime bits root val + -1 PUSHINT // domain nowtime bits root val tail_bits=-1 + s5 PUSH // domain nowtime bits root val tail_bits=-1 tail + s0 s4 XCHG // domain nowtime tail root val tail_bits=-1 bits + 3 RSHIFT# // domain nowtime tail root val tail_bits=-1 _49 + REPEAT:<{ // domain nowtime tail root val tail_bits + s0 s3 XCHG // domain nowtime tail_bits root val tail + 8 LDU // domain nowtime tail_bits root val _50 tail + SWAP // domain nowtime tail_bits root val tail _50 + 0 EQINT // domain nowtime tail_bits root val tail _54 + IF:<{ // domain nowtime tail_bits root val tail + DUP // domain nowtime tail_bits root val tail tail + SBITS // domain nowtime tail_bits root val tail _56 + s6 s(-1) PUXC // domain nowtime tail_bits root val tail domain _56 + SDSKIPLAST // domain nowtime tail_bits root val tail _57 + SHA256U // domain nowtime tail_bits root val tail _58 + 32 RSHIFT# // domain nowtime tail_bits root val tail key + s3 PUSH + 224 PUSHINT // domain nowtime tail_bits root val tail key root _65 + DICTUGET + NULLSWAPIFNOT // domain nowtime tail_bits root val tail v found? + IF:<{ // domain nowtime tail_bits root val tail v + DUP // domain nowtime tail_bits root val tail v v + 32 PLDU // domain nowtime tail_bits root val tail v _68 + s6 PUSH // domain nowtime tail_bits root val tail v _68 nowtime + GEQ // domain nowtime tail_bits root val tail v _69 + IF:<{ // domain nowtime tail_bits root val tail v + s2 POP + s3 POP // domain nowtime tail root val + s2 PUSH // domain nowtime tail root val tail + SBITS // domain nowtime tail root val tail_bits + s0 s3 XCHG // domain nowtime tail_bits root val tail + }>ELSE<{ + DROP // domain nowtime tail_bits root val tail + }> + }>ELSE<{ + DROP // domain nowtime tail_bits root val tail + }> + }> // domain nowtime tail_bits root val tail + s0 s3 XCHG // domain nowtime tail root val tail_bits + }> + 2 2 BLKDROP2 + s2 POP // domain tail_bits val + DUP // domain tail_bits val val + ISNULL // domain tail_bits val _71 + IFJMP:<{ // domain tail_bits val + 3 BLKDROP // + 0 PUSHINT // _72=0 + PUSHNULL // _72=0 _73 + OVER // _72=0 _73 _74=0 + PUSHNULL // _72=0 _73 _74=0 _75 + }> // domain tail_bits val + 32 LDU // domain tail_bits _76 val + LDREF // domain tail_bits _76 _97 _96 + DROP // domain tail_bits _76 _79 + s2 PUSH // domain tail_bits _76 _79 tail_bits + 0 EQINT // domain tail_bits _76 _79 _82 + s4 s3 XCHG2 // _79 _82 _76 domain tail_bits + SDSKIPLAST // _79 _82 _76 _83 + s3 s3 s0 XCHG3 // _76 _79 _82 _83 + }> + dnsresolve PROC:<{ + // domain category + NOW // domain category _6 + s1 s2 XCHG // category domain _6 + dnsdictlookup INLINECALLDICT // category exp cat_table exact? pfx + s0 s3 XCHG // category pfx cat_table exact? exp + IFNOTJMP:<{ // category pfx cat_table exact? + 4 BLKDROP // + 0 PUSHINT // _8=0 + PUSHNULL // _8=0 _9 + }> // category pfx cat_table exact? + IFNOT:<{ // category pfx cat_table + -1 PUSHINT + s3 POP // category=-1 pfx cat_table + }> // category pfx cat_table + SWAP // category cat_table pfx + SBITS // category cat_table pfx_bits + s2 PUSH // category cat_table pfx_bits category + IFJMP:<{ // category cat_table pfx_bits + -ROT + 16 PUSHINT // pfx_bits category cat_table _14=16 + DICTIGETOPTREF // pfx_bits cat_found + }> // category cat_table pfx_bits + s2 POP // pfx_bits cat_table + }> + getexpirationx PROC:<{ + // domain nowtime + dnsdictlookup INLINECALLDICT // _7 _8 _9 _10 + 3 BLKDROP // exp + }> + getexpiration PROC:<{ + // domain + NOW // domain _1 + getexpirationx INLINECALLDICT // _2 + }> + getstdperiod PROC:<{ + // + load_prices INLINECALLDICT // _5 _6 _7 _8 + 3 BLKDROP // stdper + }> + getppr PROC:<{ + // + load_prices INLINECALLDICT // _5 _6 _7 _8 + s2 s3 XCHG + 3 BLKDROP // ppr + }> + getppc PROC:<{ + // + load_prices INLINECALLDICT // _5 _6 _7 _8 + s1 s3 XCHG + 3 BLKDROP // ppc + }> + getppb PROC:<{ + // + load_prices INLINECALLDICT // _5 _6 _7 _8 + s0 s3 XCHG + 3 BLKDROP // ppb + }> + calcprice PROC:<{ + // domain val + load_prices INLINECALLDICT // domain val _8 _9 _10 _11 + 2 2 BLKDROP2 // domain val ppc ppb + calcprice_internal INLINECALLDICT // _7 + }> + calcregprice PROC:<{ + // domain val + load_prices INLINECALLDICT // domain val _9 _10 _11 _12 + s3 POP // domain val ppb ppr ppc + s3 s4 XCHG + s4 s0 s4 XCHG3 // ppr domain val ppc ppb + calcprice_internal INLINECALLDICT // ppr _7 + ADD // _8 + }> +}END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.cpp new file mode 100644 index 0000000000..898666a25b --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.cpp @@ -0,0 +1 @@ +with_tvm_code("dns-manual", "te6ccgECGAEAAswAART/APSkE/S88sgLAQIBIAIDAgFIBAUC6vLbPAWDCNcYIPkBAdMf0z/4I6ofUyC58mNTKoBA9A5voTHyYFKUuvKiVBNG+RDyo/gAItcLBcAzmDQBdtch0/8wjoVa2zxAA+IDgyWhyEAHgED0Q44aIIBA9JZvpWwSIJQwUwe53iCTMzUBkmwh4rPmbBXwBBESAgLFBgcCASAMDQIBzwgJAAiqgl8DAgFICgsAIdAmRlj4nln+X/+gB6AGT2qkAAUXwOAAFzI9ADJ0EEz9HDyoYAAXvZznaiaGmvmOuF/8AgEgDg8AEbs3PtRNDXCx+AP5ujDCHXSSCUXwNwbeEgd7DyXiJ41yLXCweecMhQBM8WE8sHydACpgjeIMAIlF8DcG3g2zwUXwQjcAOrApjTBwHAABOhAuQgbY6bXwMhyMsGJM8WydCECSIC2zwFpRWyIMEBFUMw5jM1IpRfBXBt4WwSxwCSfzLfAtdJpvkhgRFRAAFsAAkjEB4AKAEPRqABztRNDTH9M/0//0BPQE0QE0cFmOk9s8IMcBmyDXSpPUMNCSfzPi3iLmMDETBPbTBSHBCo4sIZEx4SHAAZcx0wfUAvsA4AHACY4U1CH7BO1DAtDtHu1TVGID8QaC8gDg8i3gcCLBFJQw0g8B3m1tJMEeit4kwRSOkSWECSPbPDMClTLHAPKjkVvi3iTAC44TNAL0BFAkgBD0bjAQI4QJWfABAeAkwAyK4DAUFRYXAIQxAtMAAcABk9QB0JjTBQGqAtcYAeIg10nCD/KmIHjXItcLB/JocFMR10mpNgKY0wcBwAASoQHkMMjLBgHPFsnQUAMAIFn0qG+lIJQC9AQwkjJt4gIAKDQDgBD0WpkQI4QJQETwAQGSMDHiAGYxIsAVnDL0BBAjhAlQQvABAeAiwBaYMgKECfRzMAHgMDIgwB+TMPQE4MAgkm0B4PIsbQE="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.fif new file mode 100644 index 0000000000..1f15c315e1 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/dns-manual-code.fif @@ -0,0 +1,477 @@ +// automatically generated from `smartcont/stdlib.fc` `smartcont/dns-manual-code.fc` +PROGRAM{ + DECLPROC pfxdict_set_ref + DECLPROC pfxdict_get_ref + DECLPROC load_data + DECLPROC store_data + DECLPROC recv_internal + 1666 DECLMETHOD after_code_upgrade + DECLPROC process_op + DECLPROC process_ops + DECLPROC recv_external + 111475 DECLMETHOD get_contract_id + 78748 DECLMETHOD get_public_key + 123660 DECLMETHOD dnsresolve + pfxdict_set_ref PROC:<{ + // dict key_len key value + NEWC // dict key_len key value _6 + STOPTREF // dict key_len key _7 + ENDC // dict key_len key _8 + CTOS // dict key_len key _9 + s1 s3 s3 XCHG3 // _9 key dict key_len + PFXDICTSET // dict _5 + 33 THROWIFNOT + }> + pfxdict_get_ref PROCREF:<{ + // dict key_len key + -ROT // key dict key_len + PFXDICTGETQ + NULLSWAPIFNOT2 // pfx val tail succ + DUP // pfx val tail succ succ + IF:<{ // pfx val tail succ + s0 s2 XCHG // pfx succ tail val + LDOPTREF // pfx succ tail _18 _17 + DROP // pfx succ tail _9 + }>ELSE<{ // pfx val tail succ + s2 POP // pfx succ tail + PUSHNULL // pfx succ tail _9 + }> // pfx succ tail res + s0 s2 XCHG // pfx res tail succ + }> + load_data PROCREF:<{ + // + c4 PUSH // _1 + CTOS // cs + 32 LDU // _4 cs + 64 LDU // _4 _7 cs + 256 LDU // _4 _7 _10 cs + LDDICT // _4 _7 _10 _13 cs + LDDICT // res res res res res cs + ENDS + }> + store_data PROC:<{ + // contract_id last_cleaned public_key root old_queries + s0 s4 XCHG + NEWC // old_queries last_cleaned public_key root contract_id _5 + 32 STU // old_queries last_cleaned public_key root _7 + s1 s3 XCHG // old_queries root public_key last_cleaned _7 + 64 STU // old_queries root public_key _9 + 256 STU // old_queries root _11 + STDICT // old_queries _12 + STDICT // _13 + ENDC // _14 + c4 POP + }> + recv_internal PROC:<{ + // msg_value in_msg_cell in_msg + 3 BLKDROP // + }> + after_code_upgrade PROC:<{ + // root ops old_code + 3 BLKDROP // + }> + process_op PROCREF:<{ + // root ops + 6 LDU // root op ops + OVER // root op ops op + 10 LESSINT // root op ops _7 + IFJMP:<{ // root op ops + OVER // root op ops op + IFNOTJMP:<{ // root op ops + NIP // root ops + }> // root op ops + OVER // root op ops op + 1 EQINT // root op ops _9 + IFJMP:<{ // root op ops + NIP // root ops + 8 LDU // root mode ops + LDREF // root mode _14 ops + s0 s2 XCHG // root ops _14 mode + SENDRAWMSG + }> // root op ops + SWAP // root ops op + 9 EQINT // root ops _18 + IFJMP:<{ // root ops + LDREF // root new_code ops + OVER // root new_code ops new_code + SETCODE + c3 PUSH // root new_code ops old_code + s0 s2 XCHG // root old_code ops new_code + CTOS // root old_code ops _25 + BLESS // root old_code ops _26 + c3 POP + s2 s(-1) s1 PU2XC // root ops root ops old_code + after_code_upgrade CALLDICT + 0 THROW + }> // root ops + 45 THROW + }> // root op ops + 0 PUSHINT // root op ops cat=0 + s2 PUSH // root op ops cat=0 op + 20 LESSINT // root op ops cat=0 _36 + IF:<{ // root op ops cat=0 + DROP // root op ops + 16 LDI // root op cat ops + SWAP // root op ops cat + }> // root op ops cat + PUSHNULL // root op ops cat name + PUSHNULL // root op ops cat name cat_table + s4 PUSH // root op ops cat name cat_table op + 30 LESSINT // root op ops cat name cat_table _45 + IF:<{ // root op ops cat name cat_table + NIP // root op ops cat cat_table + s0 s2 XCHG // root op cat_table cat ops + 1 LDU // root op cat_table cat _47 ops + SWAP // root op cat_table cat ops _47 + 1 EQINT // root op cat_table cat ops is_name_ref + IF:<{ // root op cat_table cat ops + LDREF // root op cat_table cat _52 ops + SWAP // root op cat_table cat ops _52 + CTOS // root op cat_table cat ops name + }>ELSE<{ // root op cat_table cat ops + 6 LDU // root op cat_table cat _56 ops + SWAP // root op cat_table cat ops _56 + 3 LSHIFT# // root op cat_table cat ops name_len + LDSLICEX // root op cat_table cat name ops + SWAP // root op cat_table cat ops name + }> + DUP // root op cat_table cat ops name name + SBITS // root op cat_table cat ops name _64 + 15 GTINT // root op cat_table cat ops name _66 + 38 THROWIFNOT + DUP + 8 PUSHINT // root op cat_table cat ops name name _69=8 + SDCUTLAST // root op cat_table cat ops name _70 + 8 PLDU // root op cat_table cat ops name name_last_byte + 40 THROWIF + 0 PUSHINT // root op cat_table cat ops name zeros=0 + s1 s1 PUSH2 // root op cat_table cat ops name zeros=0 cname cname + SBITS // root op cat_table cat ops name zeros=0 cname _78 + 3 RSHIFTC# // root op cat_table cat ops name zeros=0 cname _80 + REPEAT:<{ // root op cat_table cat ops name zeros cname + 8 LDU // root op cat_table cat ops name zeros c cname + SWAP // root op cat_table cat ops name zeros cname c + 0 EQINT // root op cat_table cat ops name zeros cname _86 + s1 s2 XCHG // root op cat_table cat ops name cname zeros _86 + SUB // root op cat_table cat ops name cname zeros + SWAP // root op cat_table cat ops name zeros cname + }> + DROP // root op cat_table cat ops name zeros + NEWC // root op cat_table cat ops name zeros _88 + 7 STU // root op cat_table cat ops name _90 + SWAP // root op cat_table cat ops _90 name + STSLICER // root op cat_table cat ops _91 + ENDC // root op cat_table cat ops _92 + CTOS // root op cat_table cat ops name + s0 s3 XCHG2 // root op ops cat name cat_table + }> // root op ops cat name cat_table + s4 PUSH // root op ops cat name cat_table op + 20 LESSINT // root op ops cat name cat_table _95 + IF:<{ // root op ops cat name cat_table + s5 PUSH + 10 PUSHPOW2DEC + s3 PUSH // root op ops cat name cat_table root _100=1023 name + pfxdict_get_ref INLINECALLDICT // root op ops cat name cat_table _168 _169 _170 _171 + s3 POP // root op ops cat name cat_table succ val tail + s0 s2 XCHG // root op ops cat name cat_table tail val succ + IF:<{ // root op ops cat name cat_table tail val + s2 POP // root op ops cat name val tail + SEMPTY // root op ops cat name val _103 + 35 THROWIFNOT // root op ops cat name cat_table + }>ELSE<{ + 2DROP // root op ops cat name cat_table + }> + }> // root op ops cat name cat_table + s4 PUSH // root op ops cat name cat_table op + 11 EQINT // root op ops cat name cat_table _106 + IFJMP:<{ // root op ops cat name cat_table + s4 POP // root cat_table ops cat name + s0 s2 XCHG // root cat_table name cat ops + LDOPTREF // root cat_table name cat new_value ops + s2 s4 XCHG2 + 16 PUSHINT // root ops name new_value cat cat_table _111=16 + DICTISETGETOPTREF // root ops name _174 _175 + DROP // root ops name cat_table + s2 s3 XCHG + 10 PUSHPOW2DEC + -ROT // ops root _114=1023 name cat_table + pfxdict_set_ref CALLDICT // ops root + SWAP // root ops + }> // root op ops cat name cat_table + s4 PUSH // root op ops cat name cat_table op + 12 EQINT // root op ops cat name cat_table _117 + IFJMP:<{ // root op ops cat name cat_table + s4 POP // root cat_table ops cat name + s0 s3 XCHG + 16 PUSHINT // root name ops cat cat_table _119=16 + DICTIDEL // root name ops cat_table _118 + IF:<{ // root name ops cat_table + s2 s3 XCHG + 10 PUSHPOW2DEC + s0 s4 s4 XCHG3 // ops root _122=1023 name cat_table + pfxdict_set_ref CALLDICT // ops root + SWAP // root ops + }>ELSE<{ + DROP + NIP // root ops + }> + }> // root op ops cat name cat_table + DROP + NIP // root op ops name + s2 PUSH // root op ops name op + 21 EQINT // root op ops name _125 + IFJMP:<{ // root op ops name + s2 POP // root name ops + LDOPTREF // root name new_cat_table ops + s2 s3 XCHG + 10 PUSHPOW2DEC + s4 s2 XCHG2 // ops root _130=1023 name new_cat_table + pfxdict_set_ref CALLDICT // ops root + SWAP // root ops + }> // root op ops name + s2 PUSH // root op ops name op + 22 EQINT // root op ops name _133 + IFJMP:<{ // root op ops name + s2 POP // root name ops + s0 s2 XCHG + 10 PUSHPOW2DEC // ops name root _135=1023 + PFXDICTDEL // ops _180 _181 + DROP // ops root + SWAP // root ops + }> // root op ops name + DROP + s2 POP // ops op + DUP // ops op op + 31 EQINT // ops op _138 + IFJMP:<{ // ops op + DROP // ops + LDOPTREF // new_tree_root ops + }> // ops op + 32 EQINT // ops _143 + IFJMP:<{ // ops + PUSHNULL // ops _144 + SWAP // _144 ops + }> // ops + 44 THROW + PUSHNULL // ops _147 + SWAP // _147 ops + }> + process_ops PROCREF:<{ + // root ops + FALSE // root ops stop + -ROT // stop root ops + UNTIL:<{ + process_op INLINECALLDICT // stop root ops + DUP // stop root ops ops + SDEMPTY // stop root ops _9 + IF:<{ // stop root ops + DUP // stop root ops ops + SREFS // stop root ops _10 + IF:<{ // stop root ops + LDREF // stop root _18 _17 + DROP // stop root _11 + CTOS // stop root ops + }>ELSE<{ // stop root ops + TRUE + s3 POP // stop root ops + }> + }> // stop root ops + s2 PUSH // stop root ops stop + }> // stop root ops + DROP + NIP // root + }> + recv_external PROC:<{ + // in_msg + load_data INLINECALLDICT // in_msg contract_id last_cleaned public_key root old_queries + s0 s5 XCHG + 9 PUSHPOW2 // old_queries contract_id last_cleaned public_key root in_msg _9=512 + LDSLICEX // old_queries contract_id last_cleaned public_key root signature in_msg + DUP // old_queries contract_id last_cleaned public_key root signature in_msg in_msg + HASHSU // old_queries contract_id last_cleaned public_key root signature in_msg shash + SWAP // old_queries contract_id last_cleaned public_key root signature shash in_msg + 32 LDU // old_queries contract_id last_cleaned public_key root signature shash _15 in_msg + 64 LDU // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg + NOW // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg _22 + 32 LSHIFT# // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound + s2 s0 PUSH2 // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound query_id bound + LESS // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound _26 + 35 THROWIF + s2 s10 PUSH2 + 64 PUSHINT // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound query_id old_queries _30=64 + DICTUGET + NULLSWAPIFNOT // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound _84 _85 + NIP // old_queries contract_id last_cleaned public_key root signature shash query_contract query_id in_msg bound found? + 32 THROWIF + s9 s3 PUXC // old_queries contract_id last_cleaned public_key root signature shash bound query_id in_msg contract_id query_contract + EQUAL // old_queries contract_id last_cleaned public_key root signature shash bound query_id in_msg _35 + 34 THROWIFNOT + s3 s4 s6 XC2PU // old_queries contract_id last_cleaned public_key root in_msg query_id bound shash signature public_key + CHKSIGNU // old_queries contract_id last_cleaned public_key root in_msg query_id bound _38 + 35 THROWIFNOT + ACCEPT + s2 PUSH // old_queries contract_id last_cleaned public_key root in_msg query_id bound in_msg + 6 PLDU // old_queries contract_id last_cleaned public_key root in_msg query_id bound op + 51 EQINT // old_queries contract_id last_cleaned public_key root in_msg query_id bound _45 + IF:<{ // old_queries contract_id last_cleaned public_key root in_msg query_id bound + s4 POP // old_queries contract_id last_cleaned bound root in_msg query_id + SWAP + 6 PUSHINT // old_queries contract_id last_cleaned bound root query_id in_msg _47=6 + SDSKIPFIRST // old_queries contract_id last_cleaned bound root query_id in_msg + 256 LDU // old_queries contract_id last_cleaned bound root query_id _87 _86 + DROP // old_queries contract_id last_cleaned bound root query_id public_key + }>ELSE<{ // old_queries contract_id last_cleaned public_key root in_msg query_id bound + 2SWAP // old_queries contract_id last_cleaned public_key query_id bound root in_msg + process_ops INLINECALLDICT // old_queries contract_id last_cleaned public_key query_id bound root + s0 s0 s3 XCHG3 // old_queries contract_id last_cleaned bound root query_id public_key + }> + s0 s3 XCHG + 38 PUSHPOW2 // old_queries contract_id last_cleaned public_key root query_id bound _55 + SUB // old_queries contract_id last_cleaned public_key root query_id bound + NEWC // old_queries contract_id last_cleaned public_key root query_id bound _58 + s0 s0 s7 XCHG3 + 64 PUSHINT // bound contract_id last_cleaned public_key root _58 query_id old_queries _59=64 + DICTUSETB // bound contract_id last_cleaned public_key root old_queries + UNTIL:<{ + DUP + 64 PUSHINT // bound contract_id last_cleaned public_key root old_queries old_queries _66=64 + DICTUREMMIN + NULLSWAPIFNOT2 // bound contract_id last_cleaned public_key root old_queries _88 _90 _89 _91 + 1 2 BLKDROP2 // bound contract_id last_cleaned public_key root old_queries old_queries' i f + DUP // bound contract_id last_cleaned public_key root old_queries old_queries' i f f + IF:<{ // bound contract_id last_cleaned public_key root old_queries old_queries' i f + DROP // bound contract_id last_cleaned public_key root old_queries old_queries' i + s0 s7 PUSH2 // bound contract_id last_cleaned public_key root old_queries old_queries' i i bound + LESS // bound contract_id last_cleaned public_key root old_queries old_queries' i f + }> // bound contract_id last_cleaned public_key root old_queries old_queries' i f + DUP // bound contract_id last_cleaned public_key root old_queries old_queries' i f f + IF:<{ // bound contract_id last_cleaned public_key root old_queries old_queries' i f + s3 POP + s5 POP // bound contract_id last_cleaned public_key root f old_queries + SWAP // bound contract_id last_cleaned public_key root old_queries f + }>ELSE<{ + 2 1 BLKDROP2 // bound contract_id last_cleaned public_key root old_queries f + }> + NOT // bound contract_id last_cleaned public_key root old_queries _71 + }> // bound contract_id last_cleaned public_key root old_queries + 1 5 BLKDROP2 // contract_id last_cleaned public_key root old_queries + store_data CALLDICT + }> + get_contract_id PROC:<{ + // + c4 PUSH // _0 + CTOS // _1 + 32 PLDU // _3 + }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 96 LDU // _11 _10 + NIP // cs + 256 PLDU // _9 + }> + dnsresolve PROC:<{ + // subdomain category + OVER // subdomain category subdomain + SBITS // subdomain category bits + DUP // subdomain category bits bits + IFNOTJMP:<{ // subdomain category bits + 3 BLKDROP // + 0 PUSHINT // _4=0 + PUSHNULL // _4=0 _5 + }> // subdomain category bits + DUP + 7 PUSHINT // subdomain category bits bits _7=7 + AND // subdomain category bits _8 + 30 THROWIF + s2 PUSH + 8 PUSHINT // subdomain category bits subdomain _11=8 + SDCUTLAST // subdomain category bits _12 + 8 PLDU // subdomain category bits name_last_byte + IF:<{ // subdomain category bits + 0 PUSHINT // subdomain category bits _15=0 + NEWC // subdomain category bits _15=0 _16 + s0 s4 XCHG2 // _15=0 category bits _16 subdomain + STSLICER // _15=0 category bits _17 + s1 s3 XCHG // bits category _15=0 _17 + 8 STU // bits category _19 + ENDC // bits category _20 + CTOS // bits category subdomain + s0 s2 XCHG // subdomain category bits + 8 ADDCONST // subdomain category bits + }> // subdomain category bits + DUP // subdomain category bits bits + 8 EQINT // subdomain category bits _25 + IFJMP:<{ // subdomain category bits + 3 BLKDROP // + 0 PUSHINT // _26=0 + PUSHNULL // _26=0 _27 + }> // subdomain category bits + load_data INLINECALLDICT // subdomain category bits _80 _81 _82 _83 _84 + s1 s4 XCHG + 4 BLKDROP // subdomain category bits root + s3 PUSH // subdomain category bits root cname + 0 PUSHINT // subdomain category bits root cname zeros=0 + s0 s3 XCHG // subdomain category zeros=0 root cname bits + 3 RSHIFT# // subdomain category zeros=0 root cname _38 + REPEAT:<{ // subdomain category zeros root cname + 8 LDU // subdomain category zeros root c cname + SWAP // subdomain category zeros root cname c + 0 EQINT // subdomain category zeros root cname _44 + s1 s3 XCHG // subdomain category cname root zeros _44 + SUB // subdomain category cname root zeros + s0 s2 XCHG // subdomain category zeros root cname + }> + DUP // subdomain category zeros root cname pfx + PUSHNULL // subdomain category zeros root tail pfx val + UNTIL:<{ + 3 BLKDROP // subdomain category zeros root + OVER + NEWC // subdomain category zeros root zeros _51 + 7 STU // subdomain category zeros root _53 + s4 PUSH // subdomain category zeros root _53 subdomain + STSLICER // subdomain category zeros root _54 + ENDC // subdomain category zeros root _55 + CTOS // subdomain category zeros root pfxname + 10 PUSHPOW2DEC // subdomain category zeros root pfxname _58=1023 + s2 PUSH + s0 s2 XCHG // subdomain category zeros root root _58=1023 pfxname + pfxdict_get_ref INLINECALLDICT // subdomain category zeros root pfx val tail succ + s0 s5 XCHG // subdomain category succ root pfx val tail zeros + DEC // subdomain category succ root pfx val tail _61 + s1 s5 XCHG // subdomain category tail root pfx val succ _61 + XOR // subdomain category tail root pfx val zeros + DUP // subdomain category tail root pfx val zeros zeros + 1 LESSINT // subdomain category tail root pfx val zeros _64 + s1 s5 XCHG + s3 s3 s0 XCHG3 // subdomain category zeros root tail pfx val _64 + }> // subdomain category zeros root tail pfx val + s3 POP + s5 POP // pfx category zeros val tail + s2 PUSH // pfx category zeros val tail zeros + IFNOTJMP:<{ // pfx category zeros val tail + 5 BLKDROP // + 0 PUSHINT // _65=0 + PUSHNULL // _65=0 _66 + }> // pfx category zeros val tail + 1 2 BLKDROP2 // pfx category val tail + SEMPTY // pfx category val _68 + IFNOT:<{ // pfx category val + -1 PUSHINT + s2 POP // pfx category=-1 val + }> // pfx category val + s0 s2 XCHG // val category pfx + SBITS // val category _71 + -7 ADDCONST // cat_table category pfx_bits + OVER // cat_table category pfx_bits category + 0 EQINT // cat_table category pfx_bits _76 + IFJMP:<{ // cat_table category pfx_bits + NIP // cat_table pfx_bits + SWAP // pfx_bits cat_table + }> // cat_table category pfx_bits + s0 s2 XCHG + 16 PUSHINT // pfx_bits category cat_table _78=16 + DICTIGETOPTREF // pfx_bits cat_found + }> +}END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp index 90cddeac51..fafe3fa48c 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.cpp @@ -1 +1 @@ -with_tvm_code("elector-code", "te6ccgECVQEACskAART/APSkE/Sg8sgLAQIBIAIDAgFIBAUAUaX//xh2omh6AnoCETdKrPgN+SBOKjgQ+At5ICz4DPkgcXgL+SB4DRhAAgLFBgcCASAKCwIBywgJACyqgjGCEE5Db2SCEM5Db2RwQzCAQPAGAgEgEBECASAzNAIDeqAMDQIBbg4PACSqB+1E0PQFIG6SMHCU0NcLH+IAQqss7UTQ9AUgbpJbcODwAxAmXwaDB/QOb6GT+gAwkjBw4gBzsKV7UTQ9AUgbpIwbeDwAxAmXwZthP+OHiKDB/R+b6FvoSCcAvoAMFIQbwJQA28Cklow4gGzEuYwMYAAzs+A7UTQ9AQx9AQwgwf0Dm+hk/oAMJIwcOKACASASEwIBICMkAgEgFBUCASAdHgIBIBYXAgEgGxwBASAYACE7UTQ9AT0BPQE+gDTH9P/0YAL8AdDTAwFxsJJfA+D6QDAhxwCUMQHwEOAB0x8hwACUWwHwEODTPyKCEE5zdEu6lTIQI/AL4DQhghBHZXQkupMT8BHgIYIQTkNvZLqOGVRSRPASloIQzkNvZJKEH+JwEDRDMIBA8AbgIYIQ7nZPS7oighDudk9vulIQsYrgMDMgGRoADDIQIwHwDwAkgx6wm4QfcBA0QzCAQPAG4V8DACkyBb0ABT0ABL0AAH6Assfy//J7VSAAITQ0x/TH/oA+gD0BNIA0gDRgAgEgHyACASAhIgArMgXyx8Vyx9QA/oCAfoC9ADKAMoAyYAAdIAP+DPQ0h/SH9If1wofgAEUcIAYyMsFUAfPFlj6AhXLahPLH8s/IcL/kssfkTHiyQH7AIAAbIIQ7m9FTHBDMIBA8AaACASAlJgIBIC0uAgEgJygCASApKgAjIIQ83RITIIQO5rKAEMwcvAGgAEcghBOVlNUcIIAxP/IyxAVy/+DHfoCFMtqE8sfEss/zMlx+wCAAMxTEoMH9A5voZT6ADCgkTDiyAH6AgKDB/RDgAQEgKwH+I/pE7UTQ9AQhbgSkFLGXEDVfBXDwB+AE0//TH9Mf0//UAdCDCNcZAdGCEGVMUHTIyx9SQMsfUjDLH1Jgy/9SIMv/ydBRFfkRlxBoXwhx8AfhIYMPuZcQaF8IdvAH4AfwAzEF/iANghA7msoAoSCqCyO5mBC8XwwxcvAH4FEioCwA/lF9vZcQrF8Mc/AH4ASXEJtfC3DwB+BTY4MH9A5voSCfMPoAWaAB0z8x0/8wUoC9kTHilxCbXwt08AfgUwG5lxCbXwt18AfgIPKs+AD4I8hY+gLLHxTLHxbL/xjL/0A3gwf0Q3AQVxA0ECMQJnDwBMj0AAHPFsntVCCTcPAI4FsCASAvMAIBIDEyAHkcCB/jjAkgwf0fG+hb6EgjhwC0//TPzH6ANIA0ZQxUTOgl1QYiPAKBwPiUEOgk1BCMOIBsxPmMDMBuvK7gAKEcFMAf447JoMH9HxvoW+hII4nAtP/0z8x+gDSANGUMVEzoI4RVHcIqYRRZqBSF6BLsPAKCQPiUFOgk1BSMOIBsxTmMDUDulMhu7DyuxKgAaGAAVwBgCD0Zm+hkjBw4dM/MdP/MfQE+gD6APQEMdEgwgCUEDTwDZUwECPwDOISgAKMMgL6RHD4M9DXC//tRND0BASkWr2xIW6xkl8E4PADBV8FUhW9BLMUsZJfA+D4AAGRW44d9AT0BPoAQzTwDnDIygAT9AD0AFmg+gIBzxbJ7VTigAgEgNTYCAUhPUAIBIDc4AgEgPT4CASA5OgIBIDs8AKU8AEH+kQBpLEhwACxlwWgVRMB8ALgUwKAIPQOb6GOJ9M/0//0BPoA+gALoMgVyz8Ty//0AAH6AgH6AlAGzxYBgCBURkT0Q5QwBaAB4hA1QUPwAoADZDEh+kQBpJ8wghD////+cBA0E4BA8Abg7UTQ9AT0BFAzgwf0Zm+hjhBfBIIQ/////nAQNBOAQPAG4TYF+gDRyBL0ABX0AAHPFsntVIIQ+W9zJHCAGMjLBVAEzxZQBPoCEstqEssfyz/JgED7AIABpHD4MyBuk18EcODQ1wv/I/pEAaQCvbGTXwNw4PgAAdQh+wQgxwCSXwSZAe1TAfEGgvIA4n+AAAxwgAgEgP0ACASBKSwA1HACjhMCbyIhbxACbxEkqKsPErYIEqBY5DAxgAQEgQQP+gBD4M9DTD9MPMdMP0XG2CXBtf45GKYMH9HxvoW+hII4wAvoA0x/TH9P/0//RA6PIFct/FMofUkDL/8nQURq2CMjLHxPL/8v/QBSBAaD0QQOklBA0WjDiAbNDMOYwNFi2CFMBuZdfB21wbVMR4G2K5jM0pVySbxHkcCCK5jIyNEJDRABqA4EBoPSSb6FvoSCOIAHTf1EZtggB0x8x1wv/A9Mf0/8x1wv/QTAUbwRQBW8Ck0YWW+IEsxQASgJvIgFvEASkU0i+jhBUZQbwFFMCvJMyMiKSEzDik1A0MOJTNr4BZDQiwABSQ7kSsZdfBG1wbVMR4CD+ICKlkm8R5G8QbxBwUwBtbYrmNDQ0NlJVuvKxQzQBRQT+Bm8iAW8kUx2DB/QOb6HyvfoAMdM/MdcL/1OcuY5aUTqoqw9SQLYIUUShJKo7LqkEUZWgUYmgghCOgSeKI5KAc5KAU+LIywfLH1JAy/9SoMs/I5MTy/+TUAMw4gGAEFRLmfRDcCTIy/8ayz9QBfoCGMoAQBqDB/RDiuIjioriBEZHSEkAEAsQeBBGA18DAAhMg/AKAAZMg1sAFqQqbhBbEFcVEDQSAQEgTAGtPABgCL4M/kAUwG6k18HcOAiji9TJIAg9A5voY4f0x8xINMf0/8wUAS68rn4I1ADoMjLH1jPFkAEgCD0Q5QVE18D4pNEFFvif4rmIG6SMHCQ4lAD8AJ/gTgH8AfADNPgjJbmTXwhw4HD4M26UXwjwE+CAEfgz0PoA+gD6ANMf0VNhuZRfDPAT4ASUXwvwE+AGk18KcOAQOChRMlB38BUgwAAgsysGEFsQShA5Td3wBCOOFDEyMjIyMsgS9AD0AAHPFsntVPAT4fAFMvgjAaCmxCm2CYAQ+DPQTQDQgBDXIdcLD1JwtghTE6CAEsjLB1Iwyx/LHxjLDxfLDxrLPxP0AMlw+DPQ1wv/UxjwCQn0BHAL+QBQZKApoMjLHxnLHxLL/xX0AFAD+gJw+gIWygBANIAg9EPIE/QA9AD0AAHPFsntVH8ApCGAIPR8b6FvoSCOPwLTP9P/Uxe6ji00A/QE+gD6ACirAlGZoVApoMgVyz8Wy/8S9AAB+gIB+gJYzxYBgCBUQUT0Q3CWEDUQNF8D4pNDAzDisxICASBRUgIBIFNUABkIW6SW3CVAfkAAbrigAJUAfADBV8Fk18DcOEC9ARRMYAg9A5voZNfBHDhgEDXIdcL/4Ai+DMh8BiAJPgzWPAYsY4TcMjKABL0APQAAc8Wye1U8Bcwf+BfA3CAAkzwAX+OPiSAIPR8b6FvoSCOJALTHzD4I7tTFL2wjhExVBVE8A4UoFR2E1RzWPACcJRGFVBE4pYQNxZFBTDisxAmEEUU5gZfBm6zgAOEMYAk+DNukltw4XH4M9DXC//4KPpEAaQCvbGSW3DggCL4MyBuk18DcODwBTAyAtCAKNch1wsf+CNRE6FcuZNfBnDgXKHBPJExkTDigBH4M9D6ADADoP4gUgKhcG1wEEUQNHDwBMj0APQAAc8Wye1Uf4A=="); +with_tvm_code("elector-code", "te6ccgECUwEACr8AART/APSkE/S88sgLAQIBIAIDAgFIBAUAUaX//xh2omh6AnoCETdKrPgN+SBOKjgQ+At5ICz4DPkgcXgL+SB4DRhAAgLFBgcCASAKCwIBywgJACqqgjGCEE5Db2SCEM5Db2RZcIBA8AYCASASEwIBIDM0AgN6oAwNAgFuEBECAWoODwBCqyztRND0BSBukltw4PADECZfBoMH9A5voZP6ADCSMHDiACO4ftRND0BSBukjBwlNDXCx/igAh7qu1E0PQFIG6YMHBUcABtUxHg8ANthP+OJySDB/R+b6UgjhgC+gDTHzHTH9P/0//RbwRSEG8CUANvAgKRMuIBs+YwM4AG2wpXtRND0BSBukjBt4PADECZfBm2E/44bIoMH9H5vpSCdAvoAMFIQbwJQA28CApEy4gGz5jAxgADOz4DtRND0BDH0BDCDB/QOb6GT+gAwkjBw4oAIBIBQVAgEgJCUCASAWFwIBIB4fAgEgGBkCASAcHQL3AHQ0wMBcbCSXwPg+kAwIccAlDEB8BDgAdMfIcAAlFsB8BDg0z8ighBOc3RLupUyECPwC+A0IYIQR2V0JLqTE/AR4CGCEE5Db2S6jhdUUkTwEpaCEM5Db2SShB/iQDNwgEDwBuAhghDudk9LuiKCEO52T2+6UhCxiuAwM4BobACE7UTQ9AT0BPQE+gDTH9P/0YAAKMkMA8A8AIiCDHrCZhB9AM3CAQPAG4V8DACkBcj0ABT0ABL0AAH6Assfy//J7VSAAITQ0x/TH/oA+gD0BNIA0gDRgAgEgICECASAiIwArAbIyx8Vyx9QA/oCAfoC9ADKAMoAyYAAdIAP+DPQ0h/SH9If1wofgAEUcIAYyMsFUAfPFlj6AhXLahPLH8s/IcL/kssfkTHiyQH7AIAAZIIQ7m9FTFlwgEDwBoAIBICYnAgEgLS4CASAoKQIBICorACEghDzdEhMWYIQO5rKAHLwBoABHIIQTlZTVHCCAMT/yMsQFcv/gx36AhTLahPLHxLLP8zJcfsAgADMUxKDB/QOb6GU+gAwoJEw4sgB+gICgwf0Q4AH3CP6RO1E0PQEIW4EpBSxlxA1XwVw8AfgBNP/0x/TH9P/1AHQgwjXGQHRghBlTFB0yMsfUkDLH1Iwyx9SYMv/UiDL/8nQURX5EZcQaF8IcfAH4SGDD7mXEGhfCHbwB+AH8AMxDYIQO5rKAKEgqgsjuZcQvV8NcvAH4FEioICwA+FF1vZcQrF8Mc/AH4AyXEJtfC3DwB+BTa4MH9A5voSCfMPoAWaAB0z8x0/8wUoC9kTHilxCbXwt08AfgUwG5lxCbXwt18AfgIPKs+AD4I8hY+gLLHxTLHxbL/xjL/0A4gwf0QxBFQTAWcHDwBMj0AFjPFsntVCCTcPAI4FsCASAvMAIBIDEyAHEcCB/jiwkgwf0fG+lII4dAtP/0z8x+gDSANGUMVEzoJdUGIjwCgcD4lBDoAORMuIBs+YwMwG68ruAAmRwUwB/jjcmgwf0fG+lII4oAtP/0z8x+gDSANGUMVEzoI4RVHcIqYRRZqBSF6BLsPAKCQPiUFOgBJEy4gGz5jA1A7pTIbuw8rsSoAGhgAFcAYAg9GZvoZIwcOHTPzHT/zH0BPoA+gD0BDHRIMIAlBA08A2VMBAj8AziEoACjDIC+kRw+DPQ1wv/7UTQ9AQEpFq9sSFusZJfBODwAwVfBVIVvQSzFLGSXwPg+AABkVuOHfQE9AT6AEM08A5wyMoAE/QA9ABZoPoCAc8Wye1U4oAIBIDU2AgFITU4CASA3OAIBID0+AgEgOToCASA7PAClPABB/pEAaSxIcAAsZgFoBA1VRLwAuBTAoAg9A5voY4m0z/T//QE+gD6AAugBMjLPxPL//QAAfoCAfoCUAbPFlQgU4Ag9EOUMAWgAeIQNUFD8AKAA0wxIfpEAaSeMIIQ/////kATcIBA8Abg7UTQ9AT0BFAzgwf0Zm+hn18EghD////+QBNwgEDwBuE2BfoA0QHI9AAV9AABzxbJ7VSCEPlvcyRwgBjIywVQBM8WUAT6AhLLahLLH8s/yYBA+wCAAbxw+DMgbpNfBHDg0NcL/yP6RAGkAr2xk18DcOD4AAHUIfsEIMcAkl8EnAHQ7R7tUwHxBoLyAOJ/gAAMcIAIBID9AAgEgSUoANRwAo4TAm8iIW8QAm8RJKirDxK2CBKgWOQwMYAP3IAQ+DPQ0w/TDzHTD9FxtglwbX+OQSmDB/R8b6UgjjIC+gDTH9Mf0//T/9EDowTIy38Uyh9SQMv/ydBRGrYIyMsfE8v/y/9AFIEBoPRBA6RDE5Ey4gGz5jA0WLYIUwG5l18HbXBtUxHgbYrmMzSlXJJvEeRwIIrmNjZbIoEFCQwBkA4EBoPSSb6UgjiEB039RGbYIAdMfMdcL/wPTH9P/MdcL/0EwFG8EUAVvAgSSbCHisxQASAJvIgFvEASkU0i+jhBUZQbwFFMCvJRsIiICkTDikTTiUza+EwFewABSQ7kSsZdfBG1wbVMR4FMBpZJvEeRvEG8QcFMAbW2K5jQ0NDZSVbrysVBEQxNEA/4GbyIBbyRTHYMH9A5vofK9+gAx0z8x1wv/U5y5jl1ROqirD1JAtghRRKEkqjsuqQRRlaBRiaCCEI6BJ4ojkoBzkoBT4sjLB8sfUkDL/1Kgyz8jlBPL/wKRM+JUIqiAEPRDcCTIy/8ayz9QBfoCGMoAQBqDB/RDCBBFExSK4iGKRUZHAAYDXwMACkwA8AoKARCK4gSkJG4VF0gAAlsB9QB8AM0+CMluZNfCHDgcPgzbpRfCPAT4IAR+DPQ+gD6APoA0x/RU2G5lF8M8BPgBJRfC/AT4AaTXwpw4CMQSVEyUHfwFSDAACCzKwYQWxBKEDlN3fAEI44QMWxSyPQA9AABzxbJ7VTwE+HwBTL4IwGgpsQptgmAEPgz0IEsBqTwAYAi+DP5AFMBupNfB3DgIo4vUySAIPQOb6GOINMfMSDTH9P/MFAEuvK5+CNQA6DIyx9YzxZABIAg9EMCkxNfA+KSbCHif4rmIG6SMHCQ4gHwAn+BMANCAENch1wsPUnC2CFMToIASyMsHUjDLH8sfGMsPF8sPGss/E/QAyXD4M9DXC/9TGPAJCfQEcAv5AFBkoCmgyMsfGcsfEsv/FfQAUAP6AnD6AhbKAEA0gCD0QwLI9AD0APQAAc8Wye1UfwCWI4Ag9HxvpSCOPALTP9P/UxW6ji40A/QE+gD6ACirAlGZoVApoATIyz8Wy/8S9AAB+gIB+gJYzxZUIAWAIPRDA3ABkl8D4pEy4gGzAgEgT1ACASBRUgAZCFukltwlQH5AAG64oACVAHwAwVfBZNfA3DhAvQEUTGAIPQOb6GTXwRw4YBA1yHXC/+AIvgzIfAYgCT4M1jwGLGOE3DIygAS9AD0AAHPFsntVPAXMH/gXwNwgAHs8AF/jjIkgCD0fG+lII4jAtMfMPgju1MUvbCOFTFUFUTwDhSgVHYTVHNY8AIDUFRwAd6RMuIBs+YGXwZus4ADdDGAJPgzbpJbcOFx+DPQ1wv/+Cj6RAGkAr2xkltw4IAi+DMgbpNfA3Dg8AUwMgLQgCjXIdcLH/gjUROhXLmTXwZw4FyhwTyRMZEw4oAR+DPQ+gAwA6BSAqFwbRA0ECNwcPAEyPQA9AABzxbJ7VR/g"); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif index e37ab8d892..7aa8ac2970 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/elector-code.fif @@ -33,6 +33,7 @@ PROGRAM{ 86535 DECLMETHOD active_election_id 87852 DECLMETHOD participates_in 123541 DECLMETHOD participant_list + 86698 DECLMETHOD participant_list_extended 130944 DECLMETHOD compute_returned_stake load_data PROC:<{ // @@ -48,8 +49,8 @@ PROGRAM{ }> store_data PROC:<{ // elect credits past_elect grams active_id active_hash - NEWC // elect credits past_elect grams active_id active_hash _6 - s1 s6 XCHG // active_hash credits past_elect grams active_id elect _6 + s0 s5 XCHG + NEWC // active_hash credits past_elect grams active_id elect _6 STDICT // active_hash credits past_elect grams active_id _7 s1 s4 XCHG // active_hash active_id past_elect grams credits _7 STDICT // active_hash active_id past_elect grams _8 @@ -76,8 +77,8 @@ PROGRAM{ }> pack_elect PROC:<{ // elect_at elect_close min_stake total_stake members failed finished - NEWC // elect_at elect_close min_stake total_stake members failed finished _7 - s1 s7 XCHG // finished elect_close min_stake total_stake members failed elect_at _7 + s0 s6 XCHG + NEWC // finished elect_close min_stake total_stake members failed elect_at _7 32 STU // finished elect_close min_stake total_stake members failed _9 s1 s5 XCHG // finished failed min_stake total_stake members elect_close _9 32 STU // finished failed min_stake total_stake members _11 @@ -129,16 +130,16 @@ PROGRAM{ return_stake PROC:<{ // addr query_id reason 4000269644 PUSHINT // addr query_id reason _3=4000269644 - 0 PUSHINT // addr query_id reason _3=4000269644 _4=0 - s3 s3 s0 XCHG3 + -ROT + 0 PUSHINT 64 PUSHINT // addr _3=4000269644 query_id reason _4=0 _5=64 send_message_back CALLDICT }> send_confirmation PROC:<{ // addr query_id comment 4084484172 PUSHINT // addr query_id comment _3=4084484172 - 1000000000 PUSHINT // addr query_id comment _3=4084484172 _4=1000000000 - s3 s3 s0 XCHG3 + -ROT + 1000000000 PUSHINT 2 PUSHINT // addr _3=4084484172 query_id comment _4=1000000000 _5=2 send_message_back CALLDICT }> @@ -246,108 +247,104 @@ PROGRAM{ return_stake CALLDICT }> // s_addr msg_value elect query_id ds src_addr validator_pubkey stake_at max_factor adnl_addr s0 s7 XCHG // s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect - unpack_elect CALLDICT // s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor _146 _147 _148 _149 _150 _151 _152 + unpack_elect CALLDICT // s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor _144 _145 _146 _147 _148 _149 _150 NIP // s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members finished - s0 s5 XCHG // s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members elect_at - s0 DUMP // s_addr msg_value adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members elect_at s0 s13 XCHG - 1000000000 PUSHINT // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _73=1000000000 - SUB // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value - DUP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value msg_value - 12 LSHIFT# // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _76 - s3 PUSH // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _76 total_stake - LESS // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value _77 - IFJMP:<{ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value - s11 s12 XCHG - 12 BLKDROP - NIP // s_addr query_id - 2 PUSHINT // s_addr query_id _78=2 + 1000000000 PUSHINT // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _71=1000000000 + SUB // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value + DUP // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value msg_value + 12 LSHIFT# // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _74 + s3 PUSH // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _74 total_stake + LESS // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value _75 + IFJMP:<{ // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value + s11 s13 XCHG + 13 BLKDROP // s_addr query_id + 2 PUSHINT // s_addr query_id _76=2 return_stake CALLDICT - }> // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake total_stake members msg_value - s2 s2 XCPU // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake msg_value members total_stake msg_value - ADD // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor finished elect_close min_stake msg_value members total_stake - s7 s13 XCPU // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members stake_at elect_at - NEQ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members _81 - IFJMP:<{ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members + }> // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake total_stake members msg_value + s2 s2 XCPU // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake msg_value members total_stake msg_value + ADD // s_addr finished adnl_addr query_id ds src_addr validator_pubkey stake_at max_factor elect_at elect_close min_stake msg_value members total_stake + s7 s5 XCPU // s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members stake_at elect_at + NEQ // s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members _79 + IFJMP:<{ // s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members s10 s12 XCHG 12 BLKDROP // s_addr query_id - 3 PUSHINT // s_addr query_id _82=3 + 3 PUSHINT // s_addr query_id _80=3 return_stake CALLDICT - }> // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor finished elect_close min_stake msg_value members - s0 s4 XCHG // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value finished - IFJMP:<{ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value + }> // s_addr finished adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value members + s0 s12 XCHG // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value finished + IFJMP:<{ // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value s9 s11 XCHG 11 BLKDROP // s_addr query_id - 0 PUSHINT // s_addr query_id _84=0 + 0 PUSHINT // s_addr query_id _82=0 return_stake CALLDICT - }> // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value - s6 s3 PUSH2 - 8 PUSHPOW2 // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value validator_pubkey members _88=256 + }> // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value + s6 s11 PUSH2 + 8 PUSHPOW2 // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value validator_pubkey members _86=256 DICTUGET - NULLSWAPIFNOT // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem found - DUP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem found found - IF:<{ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem found - DROP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem - LDGRAMS // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _90 mem - -ROT // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake mem msg_value _90 - ADD // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake mem msg_value - SWAP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem - 64 LDU // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _158 _157 - NIP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value mem - 256 LDU // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _160 _159 - DROP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _96 - s8 s(-1) PUXC // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value src_addr _96 - NEQ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value found + NULLSWAPIFNOT // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem found + DUP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem found found + IF:<{ // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem found + DROP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem + LDGRAMS // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _88 mem + -ROT // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake mem msg_value _88 + ADD // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake mem msg_value + SWAP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem + 64 LDU // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _156 _155 + NIP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value mem + 256 LDU // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _158 _157 + DROP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _94 + s8 s(-1) PUXC // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value src_addr _94 + NEQ // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value found }>ELSE<{ - NIP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value found + NIP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value found }> - IFJMP:<{ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value + IFJMP:<{ // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value s9 s11 XCHG 11 BLKDROP // s_addr query_id - 4 PUSHINT // s_addr query_id _100=4 + 4 PUSHINT // s_addr query_id _98=4 return_stake CALLDICT - }> // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value - s0 s1 PUSH2 // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value msg_value min_stake - LESS // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _102 - IFJMP:<{ // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value + }> // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value + s0 s1 PUSH2 // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value msg_value min_stake + LESS // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _100 + IFJMP:<{ // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value s9 s11 XCHG 11 BLKDROP // s_addr query_id - 5 PUSHINT // s_addr query_id _103=5 + 5 PUSHINT // s_addr query_id _101=5 return_stake CALLDICT - }> // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value - DUP // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value msg_value + }> // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value + DUP // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value msg_value 44 THROWIFNOT ACCEPT - NOW // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _109 - NEWC // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake msg_value _109 _110 - ROT // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake _109 _110 msg_value - STGRAMS // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake _109 _111 - 32 STU // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor members elect_close min_stake _113 - s1 s4 XCHG // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake members elect_close max_factor _113 - 32 STU // s_addr elect_at adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake members elect_close _115 - s1 s6 XCHG // s_addr elect_at adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake members src_addr _115 - 256 STU // s_addr elect_at adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake members _117 - s1 s8 XCHG // s_addr elect_at members query_id ds elect_close validator_pubkey total_stake min_stake adnl_addr _117 - 256 STU // s_addr elect_at members query_id ds elect_close validator_pubkey total_stake min_stake _119 - s0 s3 s7 XCHG3 - 8 PUSHPOW2 // s_addr elect_at total_stake query_id ds elect_close min_stake _119 validator_pubkey members _120=256 - DICTUSETB // s_addr elect_at total_stake query_id ds elect_close min_stake members - FALSE // s_addr elect_at total_stake query_id ds elect_close min_stake members _122 - s5 s7 XCHG - s3 s4 XCHG - s2 s3 XCHG - s2 s6 XCHG - FALSE // s_addr query_id ds elect_at elect_close min_stake total_stake members _122 _123 - pack_elect CALLDICT // s_addr query_id ds elect - NEWC // s_addr query_id ds elect _125 - STDICT // s_addr query_id ds _126 - SWAP // s_addr query_id _126 ds - STSLICER // s_addr query_id _127 - ENDC // s_addr query_id _128 + NOW // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake msg_value _107 + NEWC + ROT // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake _107 _108 msg_value + STGRAMS // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake _107 _109 + 32 STU // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake max_factor elect_at elect_close min_stake _111 + s1 s4 XCHG // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake elect_at elect_close max_factor _111 + 32 STU // s_addr members adnl_addr query_id ds src_addr validator_pubkey total_stake min_stake elect_at elect_close _113 + s1 s6 XCHG // s_addr members adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake elect_at src_addr _113 + 256 STU // s_addr members adnl_addr query_id ds elect_close validator_pubkey total_stake min_stake elect_at _115 + s1 s8 XCHG // s_addr members elect_at query_id ds elect_close validator_pubkey total_stake min_stake adnl_addr _115 + 256 STU // s_addr members elect_at query_id ds elect_close validator_pubkey total_stake min_stake _117 + s0 s3 s8 XCHG3 + 8 PUSHPOW2 // s_addr total_stake elect_at query_id ds elect_close min_stake _117 validator_pubkey members _118=256 + DICTUSETB // s_addr total_stake elect_at query_id ds elect_close min_stake members + s4 s5 XCHG + s1 s3 s0 XCHG3 + s1 s6 XCHG + FALSE + FALSE // s_addr ds query_id elect_at elect_close min_stake total_stake members _120 _121 + pack_elect CALLDICT // s_addr ds query_id elect + NEWC // s_addr ds query_id elect _123 + STDICT // s_addr ds query_id _124 + ROT // s_addr query_id _124 ds + STSLICER // s_addr query_id _125 + ENDC // s_addr query_id _126 c4 POP DUP // s_addr query_id query_id IFJMP:<{ // s_addr query_id - 0 PUSHINT // s_addr query_id _130=0 + 0 PUSHINT // s_addr query_id _128=0 send_confirmation CALLDICT }> // s_addr query_id 2DROP // @@ -361,8 +358,7 @@ PROGRAM{ s4 PUSH 8 PUSHPOW2 // credits freeze_dict tot_stakes total recovered pubkey freeze_dict _10=256 DICTUGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // credits freeze_dict tot_stakes total recovered cs pubkey f + NULLSWAPIFNOT2 // credits freeze_dict tot_stakes total recovered cs pubkey f DUP // credits freeze_dict tot_stakes total recovered cs pubkey f f IF:<{ // credits freeze_dict tot_stakes total recovered cs pubkey f s0 s2 XCHG // credits freeze_dict tot_stakes total recovered f pubkey cs @@ -384,13 +380,12 @@ PROGRAM{ }> s4 s3 XCHG2 // credits freeze_dict tot_stakes pubkey recovered f total stake ADD // credits freeze_dict tot_stakes pubkey recovered f total + s0 s3 XCHG // credits freeze_dict tot_stakes total recovered f pubkey }>ELSE<{ - s4 s2 XCHG2 - DROP // credits freeze_dict tot_stakes pubkey recovered f total + s2 POP // credits freeze_dict tot_stakes total recovered f pubkey }> - SWAP // credits freeze_dict tot_stakes pubkey recovered total f - NOT // credits freeze_dict tot_stakes pubkey recovered total _32 - s1 s3 XCHG // credits freeze_dict tot_stakes total recovered pubkey _32 + SWAP // credits freeze_dict tot_stakes total recovered pubkey f + NOT // credits freeze_dict tot_stakes total recovered pubkey _32 }> // credits freeze_dict tot_stakes total recovered pubkey DROP s3 POP // credits recovered tot_stakes total @@ -407,8 +402,7 @@ PROGRAM{ s6 PUSH 8 PUSHPOW2 // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey freeze_dict _12=256 DICTUGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f + NULLSWAPIFNOT2 // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f DUP // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f f IF:<{ // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered cs pubkey f s0 s2 XCHG // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered f pubkey cs @@ -436,13 +430,12 @@ PROGRAM{ }> s5 s3 XCHG2 // credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered f total stake ADD // credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered f total + s0 s4 XCHG // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered f pubkey }>ELSE<{ - s5 s2 XCHG2 - DROP // credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered f total + s2 POP // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered f pubkey }> - SWAP // credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered total f - NOT // credits freeze_dict tot_stakes tot_bonuses pubkey returned_bonuses recovered total _38 - s1 s4 XCHG // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey _38 + SWAP // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey f + NOT // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey _38 }> // credits freeze_dict tot_stakes tot_bonuses total returned_bonuses recovered pubkey DROP s5 POP // credits recovered tot_stakes tot_bonuses total returned_bonuses @@ -563,8 +556,8 @@ PROGRAM{ IFJMP:<{ // active_hash msg_value elect credits past_elect grams active_id s0 s5 XCHG // active_hash active_id elect credits past_elect grams msg_value ADD // active_hash active_id elect credits past_elect grams - 2 4 BLKSWAP - SWAP // elect credits past_elect grams active_id active_hash + s3 s5 XCHG + 2 3 BLKSWAP // elect credits past_elect grams active_id active_hash store_data CALLDICT }> // active_hash msg_value elect credits past_elect grams active_id s0 s2 PUSH2 @@ -579,8 +572,8 @@ PROGRAM{ LDGRAMS // active_hash msg_value elect credits past_elect grams active_id data hash dict total_stake bonuses fs s0 s11 XCHG // active_hash fs elect credits past_elect grams active_id data hash dict total_stake bonuses msg_value ADD // active_hash fs elect credits past_elect grams active_id data hash dict total_stake bonuses - NEWC // active_hash fs elect credits past_elect grams active_id data hash dict total_stake bonuses _44 - s1 s5 XCHG // active_hash fs elect credits past_elect grams active_id bonuses hash dict total_stake data _44 + s0 s4 XCHG + NEWC // active_hash fs elect credits past_elect grams active_id bonuses hash dict total_stake data _44 64 STU // active_hash fs elect credits past_elect grams active_id bonuses hash dict total_stake _46 s1 s3 XCHG // active_hash fs elect credits past_elect grams active_id bonuses total_stake dict hash _46 256 STU // active_hash fs elect credits past_elect grams active_id bonuses total_stake dict _48 @@ -591,9 +584,8 @@ PROGRAM{ STGRAMS // active_hash fs elect credits past_elect grams active_id _51 s0 s6 XCHG2 // active_hash active_id elect credits past_elect grams _51 fs STSLICER // active_hash active_id elect credits past_elect grams _52 - SWAP - 32 PUSHINT - s6 s3 s3 PUXC2 // active_hash active_id elect credits grams _52 active_id past_elect _53=32 + s0 s5 s2 XCPUXC + 32 PUSHINT // active_hash active_id elect credits grams _52 active_id past_elect _53=32 DICTUSETB // active_hash active_id elect credits grams past_elect }>ELSE<{ // active_hash msg_value elect credits past_elect grams active_id fs DROP // active_hash msg_value elect credits past_elect grams active_id @@ -615,9 +607,8 @@ PROGRAM{ IFJMP:<{ // op s_addr query_id src_addr DROP // op s_addr query_id 4294967294 PUSHINT // op s_addr query_id _9=4294967294 - 0 PUSHINT // op s_addr query_id _9=4294967294 _10=0 - s3 s4 XCHG - s1 s3 XCHG + s0 s1 s3 XCHG3 + 0 PUSHINT 64 PUSHINT // s_addr _9=4294967294 query_id op _10=0 _11=64 send_message_back CALLDICT }> // op s_addr query_id src_addr @@ -632,9 +623,8 @@ PROGRAM{ IFNOTJMP:<{ // op s_addr query_id ds elect credits cs 4 BLKDROP // op s_addr query_id 4294967294 PUSHINT // op s_addr query_id _27=4294967294 - 0 PUSHINT // op s_addr query_id _27=4294967294 _28=0 - s3 s4 XCHG - s1 s3 XCHG + s0 s1 s3 XCHG3 + 0 PUSHINT 64 PUSHINT // s_addr _27=4294967294 query_id op _28=0 _29=64 send_message_back CALLDICT }> // op s_addr query_id ds elect credits cs @@ -642,8 +632,8 @@ PROGRAM{ s0 s5 XCHG // credits s_addr query_id ds elect cs LDGRAMS // credits s_addr query_id ds elect amount cs ENDS - NEWC // credits s_addr query_id ds elect amount _35 - s1 s2 XCHG // credits s_addr query_id ds amount elect _35 + SWAP + NEWC // credits s_addr query_id ds amount elect _35 STDICT // credits s_addr query_id ds amount _36 s1 s5 XCHG // amount s_addr query_id ds credits _36 STDICT // amount s_addr query_id ds _37 @@ -674,8 +664,8 @@ PROGRAM{ NIP // s_addr query_id 1313042276 PUSHINT // s_addr query_id op=1313042276 3460525924 PUSHINT // s_addr query_id op=1313042276 _5=3460525924 - 0 PUSHINT // s_addr query_id op=1313042276 _5=3460525924 _6=0 - s3 s3 s0 XCHG3 + -ROT + 0 PUSHINT 64 PUSHINT // s_addr _5=3460525924 query_id op=1313042276 _6=0 _7=64 send_message_back CALLDICT }> @@ -711,6 +701,8 @@ PROGRAM{ SEMPTY // s_addr query_id code cs _25 IFNOT:<{ // s_addr query_id code cs SWAP // s_addr query_id cs code + CTOS // s_addr query_id cs _26 + BLESS // s_addr query_id cs _27 c3 POP SWAP // s_addr cs query_id after_code_upgrade CALLDICT @@ -718,7 +710,7 @@ PROGRAM{ }>ELSE<{ 4 BLKDROP // }> - TRUE // _30 + TRUE // _32 }> recv_internal PROC:<{ // msg_value in_msg_cell in_msg @@ -777,9 +769,8 @@ PROGRAM{ }>ELSE<{ // query_id s_addr op 32 PUSHPOW2DEC // query_id s_addr op _37=4294967295 }> - 0 PUSHINT // query_id s_addr op _37 _40=0 - s3 s4 XCHG - s3 s3 s0 XCHG3 + s0 s3 s3 XCHG3 + 0 PUSHINT 64 PUSHINT // s_addr _37 query_id op _40=0 _41=64 send_message_back CALLDICT }> // in_msg s_addr op query_id @@ -793,8 +784,7 @@ PROGRAM{ OR // in_msg s_addr op query_id cfg_ok _48 IFJMP:<{ // in_msg s_addr op query_id cfg_ok s2 POP // in_msg s_addr cfg_ok query_id - s2 s3 XCHG - SWAP // s_addr in_msg query_id cfg_ok + s3 s0 s0 XCHG3 // s_addr in_msg query_id cfg_ok config_set_confirmed CALLDICT }> // in_msg s_addr op query_id cfg_ok DROP @@ -804,9 +794,8 @@ PROGRAM{ AND // query_id s_addr op _53 IFNOTJMP:<{ // query_id s_addr op 32 PUSHPOW2DEC // query_id s_addr op _54=4294967295 - 0 PUSHINT // query_id s_addr op _54=4294967295 _55=0 - s3 s4 XCHG - s3 s3 s0 XCHG3 + s0 s3 s3 XCHG3 + 0 PUSHINT 64 PUSHINT // s_addr _54=4294967295 query_id op _55=0 _56=64 send_message_back CALLDICT }> // query_id s_addr op @@ -845,7 +834,7 @@ PROGRAM{ CONFIGOPTPARAM // credits members min_stake max_stake min_total_stake max_stake_factor _8 CTOS // credits members min_stake max_stake min_total_stake max_stake_factor cs 16 LDU // credits members min_stake max_stake min_total_stake max_stake_factor _13 cs - 16 LDU // credits members min_stake max_stake min_total_stake max_stake_factor _13 _258 _257 + 16 LDU // credits members min_stake max_stake min_total_stake max_stake_factor _13 _256 _255 NIP // credits members min_stake max_stake min_total_stake max_stake_factor _13 cs 16 LDU // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators cs ENDS @@ -858,8 +847,7 @@ PROGRAM{ s9 PUSH 8 PUSHPOW2 // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey members _33=256 DICTUGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f + NULLSWAPIFNOT2 // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f DUP // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f f IF:<{ // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict cs pubkey f s0 s2 XCHG // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey cs @@ -871,8 +859,8 @@ PROGRAM{ ENDS s0 s3 XCHG // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey stake adnl_addr max_factor addr time NEGATE // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey stake adnl_addr max_factor addr _56 - NEWC // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey stake adnl_addr max_factor addr _56 _57 - s1 s5 XCHG // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey _56 adnl_addr max_factor addr stake _57 + s0 s4 XCHG + NEWC // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey _56 adnl_addr max_factor addr stake _57 128 STU // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey _56 adnl_addr max_factor addr _59 s1 s4 XCHG // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey addr adnl_addr max_factor _56 _59 32 STI // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey addr adnl_addr max_factor _61 @@ -892,14 +880,12 @@ PROGRAM{ DICTSETB // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n pubkey f sdict s0 s3 XCHG // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey f n INC // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey f n + s3 s1 s3 XCHG3 // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey }>ELSE<{ - s3 s4 XCHG - 2SWAP - DROP // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey f n + s2 POP // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict f pubkey }> - SWAP // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey n f - NOT // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators sdict pubkey n _83 - s3 s3 s0 XCHG3 // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey _83 + SWAP // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey f + NOT // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey _83 }> // credits members min_stake max_stake min_total_stake max_stake_factor max_validators min_validators n sdict pubkey DROP s4 POP // credits members min_stake max_stake min_total_stake sdict max_validators min_validators n @@ -919,8 +905,7 @@ PROGRAM{ s0 s3 XCHG 416 PUSHINT // credits members min_stake max_stake min_total_stake l min_validators n sdict _101 DICTREMMIN - NULLSWAPIFNOT - NULLSWAPIFNOT // credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f + NULLSWAPIFNOT2 // credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f DUP // credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f f IF:<{ // credits members min_stake max_stake min_total_stake l min_validators n sdict cs key f SWAP // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f key @@ -928,12 +913,12 @@ PROGRAM{ s1 s9 XCPU // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f key _106 max_stake MIN // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f key _109 SWAP // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 key - 32 LDU // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 _284 _283 + 32 LDU // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 _282 _281 NIP // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f _109 key 256 PLDU // credits members min_stake max_stake min_total_stake l min_validators n sdict cs f stake pubkey s0 s3 XCHG // credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake cs 32 LDU // credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 cs - 256 LDU // credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 _288 _287 + 256 LDU // credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 _286 _285 NIP // credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake _118 cs 256 PLDU // credits members min_stake max_stake min_total_stake l min_validators n sdict pubkey f stake max_f adnl_addr s1 s3 s0 XCHG3 @@ -941,11 +926,10 @@ PROGRAM{ 4 TUPLE // credits members min_stake max_stake min_total_stake l min_validators n sdict f _126 s0 s5 XCHG2 // credits members min_stake max_stake min_total_stake f min_validators n sdict _126 l CONS // credits members min_stake max_stake min_total_stake f min_validators n sdict l + s0 s4 XCHG // credits members min_stake max_stake min_total_stake l min_validators n sdict f }>ELSE<{ - s6 s1 s6 XCHG3 - 2DROP // credits members min_stake max_stake min_total_stake f min_validators n sdict l + 2 1 BLKDROP2 // credits members min_stake max_stake min_total_stake l min_validators n sdict f }> - s0 s4 XCHG // credits members min_stake max_stake min_total_stake l min_validators n sdict f NOT // credits members min_stake max_stake min_total_stake l min_validators n sdict _128 s1 s4 XCHG // credits members min_stake max_stake min_total_stake sdict min_validators n l _128 }> // credits members min_stake max_stake min_total_stake sdict min_validators n l @@ -973,24 +957,22 @@ PROGRAM{ s0 s2 PUSH2 // credits members min_stake n min_total_stake l i m best_stake l1 tot_stake tot_stake best_stake GREATER // credits members min_stake n min_total_stake l i m best_stake l1 tot_stake _148 IF:<{ // credits members min_stake n min_total_stake l i m best_stake l1 tot_stake - s2 POP - s2 POP // credits members min_stake n min_total_stake l i l1 tot_stake + 2 2 BLKDROP2 // credits members min_stake n min_total_stake l i l1 tot_stake s2 PUSH // credits members min_stake n min_total_stake l i l1 best_stake m + s0 s2 XCHG // credits members min_stake n min_total_stake l i m best_stake l1 }>ELSE<{ - s1 s3 XCHG - DROP // credits members min_stake n min_total_stake l i l1 best_stake m + DROP // credits members min_stake n min_total_stake l i m best_stake l1 }> }>ELSE<{ - s3 s4 XCHG2 - DROP // credits members min_stake n min_total_stake l i l1 best_stake m + s4 POP // credits members min_stake n min_total_stake l i m best_stake l1 }> - s3 s6 PUSH2 // credits members min_stake n min_total_stake l i l1 best_stake m i n - GEQ // credits members min_stake n min_total_stake l i l1 best_stake m _149 + s3 s6 PUSH2 // credits members min_stake n min_total_stake l i m best_stake l1 i n + GEQ // credits members min_stake n min_total_stake l i m best_stake l1 _149 + s1 s3 XCHG // credits members min_stake n min_total_stake l i l1 best_stake m _149 }> // credits members min_stake n min_total_stake l i l1 best_stake m - s2 POP - s2 POP - s4 POP - s4 POP // credits members best_stake m min_total_stake l + s6 POP + s6 POP + 2DROP // credits members best_stake m min_total_stake l s2 PUSH // credits members best_stake m min_total_stake l m 0 EQINT // credits members best_stake m min_total_stake l _151 s4 s2 PUXC // credits members best_stake m _151 l best_stake min_total_stake @@ -1004,14 +986,12 @@ PROGRAM{ NEWDICT // credits _154 _155=0 _156 s1 s1 PUSH2 // credits _154 _155=0 _156 _157=0 _158=0 }> // credits members best_stake m l - DUP // credits members best_stake m l l1 - s0 DUMP // credits members best_stake m l l1 - s2 PUSH // credits members best_stake m l l1 m - DEC // credits members best_stake m l l1 _163 + s0 s1 PUSH2 // credits members best_stake m l l1 m + DEC // credits members best_stake m l l1 _161 REPEAT:<{ // credits members best_stake m l l1 CDR // credits members best_stake m l l1 }> - CAR // credits members best_stake m l _166 + CAR // credits members best_stake m l _164 0 INDEX // credits members best_stake m l m_stake 0 PUSHINT // credits members best_stake m l m_stake i=0 s0 s0 PUSH2 // credits members best_stake m l m_stake i=0 tot_stake=0 tot_weight=0 @@ -1019,110 +999,107 @@ PROGRAM{ NEWDICT // credits members best_stake m l m_stake i=0 tot_stake=0 tot_weight=0 vset frozen UNTIL:<{ s0 s6 XCHG // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l - UNCONS // credits members best_stake m frozen m_stake i tot_stake tot_weight vset _183 l - SWAP // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l _183 + UNCONS // credits members best_stake m frozen m_stake i tot_stake tot_weight vset _181 l + SWAP // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l _181 4 UNTUPLE // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr s1 s13 PUSH2 - 8 PUSHPOW2 // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr pubkey members _188=256 + 8 PUSHPOW2 // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr pubkey members _186=256 DICTUGET NULLSWAPIFNOT // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr val f 61 THROWIFNOT - LDGRAMS // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _300 _299 + LDGRAMS // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _298 _297 NIP // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr val - 64 LDU // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _302 _301 + 64 LDU // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr _300 _299 NIP // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr val 256 PLDU // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr s9 s12 PUSH2 // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr i m - LESS // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr _202 + LESS // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr _200 IF:<{ // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake max_f pubkey adnl_addr src_addr s3 s10 XCPU // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr max_f m_stake - MUL // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _204 - 16 RSHIFT# // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _206 - s4 s(-1) PUXC // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr stake _206 + MUL // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _202 + 16 RSHIFT# // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr _204 + s4 s(-1) PUXC // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr stake _204 MIN // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr pubkey adnl_addr true_stake s4 s4 XCPU // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake true_stake SUB // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake s4 PUSH // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake true_stake - 60 LSHIFT# // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _211 - s14 PUSH // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _211 best_stake + 60 LSHIFT# // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _209 + s14 PUSH // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake _209 best_stake DIV // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l true_stake src_addr pubkey adnl_addr stake weight s9 s5 XCPU // credits members best_stake m frozen m_stake i weight tot_weight vset l true_stake src_addr pubkey adnl_addr stake tot_stake true_stake ADD // credits members best_stake m frozen m_stake i weight tot_weight vset l true_stake src_addr pubkey adnl_addr stake tot_stake s8 s9 XCPU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight weight ADD // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight - 2390828938 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 - s3 PUSH // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 adnl_addr - IF:<{ // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 - 115 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _217=115 - }>ELSE<{ // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 - 83 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _217=83 + 2390828938 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 + s3 PUSH // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 adnl_addr + IF:<{ // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 + 115 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _215=115 + }>ELSE<{ // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 + 83 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _215=83 }> - NEWC // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _217 _220 - 8 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _216=2390828938 _222 - 32 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _224 - s4 s(-1) PUXC // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight pubkey _224 - 256 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _226 - s10 s(-1) PUXC // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight weight _226 + NEWC // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _215 _218 + 8 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _214=2390828938 _220 + 32 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _222 + s4 s(-1) PUXC // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight pubkey _222 + 256 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight _224 + s10 s(-1) PUXC // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight weight _224 64 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight vinfo s3 PUSH // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight vinfo adnl_addr IF:<{ // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey adnl_addr stake tot_weight vinfo s1 s3 XCHG // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey tot_weight stake adnl_addr vinfo 256 STU // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey tot_weight stake vinfo + s0 s2 XCHG // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey vinfo stake tot_weight }>ELSE<{ - s0 s3 XCHG2 - DROP // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey tot_weight stake vinfo + s3 POP // credits members best_stake m frozen m_stake i weight tot_stake vset l true_stake src_addr pubkey vinfo stake tot_weight }> - SWAP - 16 PUSHINT - s11 s8 s8 PUXC2 // credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vinfo i vset _233=16 - DICTUSETB // credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset - FALSE // credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset _236 + s2 s10 s7 XCPUXC + 16 PUSHINT // credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vinfo i vset _231=16 + DICTUSETB // credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset + FALSE // credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset _234 s4 PUSH - NEWC // credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset _236 src_addr _237 - 256 STU // credits members best_stake m frozen m_stake i weight tot_stake stake l true_stake src_addr pubkey tot_weight vset _236 _239 - s1 s10 XCHG // credits members best_stake m frozen m_stake i _236 tot_stake stake l true_stake src_addr pubkey tot_weight vset weight _239 - 64 STU // credits members best_stake m frozen m_stake i _236 tot_stake stake l true_stake src_addr pubkey tot_weight vset _241 - s0 s5 XCHG2 // credits members best_stake m frozen m_stake i _236 tot_stake stake l vset src_addr pubkey tot_weight _241 true_stake - STGRAMS // credits members best_stake m frozen m_stake i _236 tot_stake stake l vset src_addr pubkey tot_weight _242 - s1 s8 XCHG // credits members best_stake m frozen m_stake i tot_weight tot_stake stake l vset src_addr pubkey _236 _242 - 1 STI // credits members best_stake m frozen m_stake i tot_weight tot_stake stake l vset src_addr pubkey _244 + NEWC // credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset _234 src_addr _235 + 256 STU // credits members best_stake m frozen m_stake i weight tot_stake tot_weight l true_stake src_addr pubkey stake vset _234 _237 + s1 s10 XCHG // credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l true_stake src_addr pubkey stake vset weight _237 + 64 STU // credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l true_stake src_addr pubkey stake vset _239 + s0 s5 XCHG2 // credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l vset src_addr pubkey stake _239 true_stake + STGRAMS // credits members best_stake m frozen m_stake i _234 tot_stake tot_weight l vset src_addr pubkey stake _240 + s1 s8 XCHG // credits members best_stake m frozen m_stake i stake tot_stake tot_weight l vset src_addr pubkey _234 _240 + 1 STI // credits members best_stake m frozen m_stake i stake tot_stake tot_weight l vset src_addr pubkey _242 s0 s1 s10 XCHG3 - 8 PUSHPOW2 // credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset _244 pubkey frozen _245=256 - DICTUSETB // credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen + 8 PUSHPOW2 // credits members best_stake m src_addr m_stake i stake tot_stake tot_weight l vset _242 pubkey frozen _243=256 + DICTUSETB // credits members best_stake m src_addr m_stake i stake tot_stake tot_weight l vset frozen + s0 s8 XCHG + s4 s5 XCHG + s1 s3 XCHG + s1 s4 XCHG // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr }>ELSE<{ - s0 s11 XCHG - s7 s8 XCHG - s4 s6 XCHG s0 s3 XCHG - 3 BLKDROP // credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen + 3 BLKDROP // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr }> - s3 PUSH // credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen stake - IF:<{ // credits members best_stake m src_addr m_stake i tot_weight tot_stake stake l vset frozen - s12 s8 s3 XCHG3 // l members best_stake m vset m_stake i tot_weight tot_stake frozen credits src_addr stake - ~credit_to CALLDICT // l members best_stake m vset m_stake i tot_weight tot_stake frozen credits + OVER // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr stake + IF:<{ // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l stake src_addr + s12 s0 s0 XCHG3 // l members best_stake m frozen m_stake i tot_stake tot_weight vset credits src_addr stake + ~credit_to CALLDICT // l members best_stake m frozen m_stake i tot_stake tot_weight vset credits + s0 s10 XCHG // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l }>ELSE<{ - s12 s8 s3 XCHG3 - 2DROP // l members best_stake m vset m_stake i tot_weight tot_stake frozen credits + 2DROP // credits members best_stake m frozen m_stake i tot_stake tot_weight vset l }> - s0 s4 XCHG // l members best_stake m vset m_stake credits tot_weight tot_stake frozen i - INC // l members best_stake m vset m_stake credits tot_weight tot_stake frozen i - s10 PUSH // l members best_stake m vset m_stake credits tot_weight tot_stake frozen i l - ISNULL // l members best_stake m vset m_stake credits tot_weight tot_stake frozen i _251 - s5 s11 XCHG - s5 s7 XCHG + s0 s4 XCHG // credits members best_stake m frozen m_stake l tot_stake tot_weight vset i + INC // credits members best_stake m frozen m_stake l tot_stake tot_weight vset i + s4 PUSH // credits members best_stake m frozen m_stake l tot_stake tot_weight vset i l + ISNULL // credits members best_stake m frozen m_stake l tot_stake tot_weight vset i _249 s1 s5 XCHG - s3 s4 XCHG - s1 s2 XCHG // credits members best_stake m l m_stake i tot_stake tot_weight vset frozen _251 + s1 s7 XCHG // credits members best_stake m l m_stake i tot_stake tot_weight vset frozen _249 }> // credits members best_stake m l m_stake i tot_stake tot_weight vset frozen s4 POP s4 POP s4 POP s6 POP // credits tot_stake best_stake m tot_weight vset frozen s5 s4 PUXC // credits tot_stake frozen m tot_weight vset tot_stake best_stake - EQUAL // credits tot_stake frozen m tot_weight vset _253 + EQUAL // credits tot_stake frozen m tot_weight vset _251 49 THROWIFNOT - s3 s3 s4 XCHG3 - SWAP // credits vset tot_weight frozen tot_stake m + s4 s4 XCHG2 + s3 s1 s3 XCHG3 // credits vset tot_weight frozen tot_stake m }> conduct_elections PROC:<{ // ds elect credits @@ -1167,8 +1144,8 @@ PROGRAM{ 10 BLKDROP // FALSE // _38 }> // ds credits elect_at elect_close min_total_stake total_stake members max_stake_factor min_stake max_stake - s3 s8 XCHG - s8 PUSH + s3 PUSH + s4 s9 XCHG s3 s2 XCPU s7 s7 XCHG2 // ds members elect_at elect_close min_stake total_stake credits members min_stake max_stake min_total_stake max_stake_factor try_elect CALLDICT // ds members elect_at elect_close min_stake total_stake credits vdict total_weight frozen total_stakes cnt @@ -1186,13 +1163,8 @@ PROGRAM{ s3 PUSH // ds total_weight elect_at frozen total_stakes cnt credits vdict elect cnt IFNOTJMP:<{ // ds total_weight elect_at frozen total_stakes cnt credits vdict elect NIP - s2 POP - s2 POP - s2 POP - s2 POP - s2 POP // ds elect credits - NEWC // ds elect credits _49 - s1 s2 XCHG // ds credits elect _49 + 5 2 BLKDROP2 + NEWC // ds credits elect _49 STDICT // ds credits _50 STDICT // ds _51 SWAP // _51 ds @@ -1266,8 +1238,8 @@ PROGRAM{ s0 s3 s4 XCHG3 32 PUSHINT // ds elect credits _121 elect_at past_elect _122=32 DICTUSETB // ds elect credits past_elect - NEWC // ds elect credits past_elect _124 - s1 s3 XCHG // ds past_elect credits elect _124 + s0 s2 XCHG + NEWC // ds past_elect credits elect _124 STDICT // ds past_elect credits _125 STDICT // ds past_elect _126 STDICT // ds _127 @@ -1315,79 +1287,75 @@ PROGRAM{ s0 s0 s4 XCHG3 32 PUSHINT // elect credits cur_hash grams _39 active_id past_elect _40=32 DICTUSETB // elect credits cur_hash grams past_elect + s0 s2 XCHG // elect credits past_elect grams cur_hash }>ELSE<{ - s1 s5 XCHG s1 s3 XCHG - 3 BLKDROP // elect credits cur_hash grams past_elect + 3 BLKDROP // elect credits past_elect grams cur_hash }> }>ELSE<{ - s4 s1 s4 XCHG3 - 2DROP // elect credits cur_hash grams past_elect + 2 1 BLKDROP2 // elect credits past_elect grams cur_hash }> - -1 PUSHINT // elect credits cur_hash grams past_elect id=-1 + -1 PUSHINT // elect credits past_elect grams cur_hash id=-1 UNTIL:<{ - OVER - 32 PUSHINT // elect credits cur_hash grams past_elect id past_elect _46=32 + s3 PUSH + 32 PUSHINT // elect credits past_elect grams cur_hash id past_elect _46=32 DICTUGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // elect credits cur_hash grams past_elect fs id f - DUP // elect credits cur_hash grams past_elect fs id f f - IF:<{ // elect credits cur_hash grams past_elect fs id f - s0 s2 XCHG // elect credits cur_hash grams past_elect f id fs - 64 LDU // elect credits cur_hash grams past_elect f id _50 fs - 256 LDU // elect credits cur_hash grams past_elect f id tm hash fs - s1 s7 PUSH2 // elect credits cur_hash grams past_elect f id tm hash fs hash cur_hash - EQUAL // elect credits cur_hash grams past_elect f id tm hash fs _56 - IF:<{ // elect credits cur_hash grams past_elect f id tm hash fs - s4 POP // elect credits cur_hash grams past_elect fs id tm hash - s0 s3 XCHG // elect credits cur_hash grams past_elect hash id tm fs - LDDICT // elect credits cur_hash grams past_elect hash id tm _60 fs - LDGRAMS // elect credits cur_hash grams past_elect hash id tm _60 _62 fs - LDGRAMS // elect credits cur_hash grams past_elect hash id tm dict total_stake bonuses fs - s8 PUSH // elect credits cur_hash grams past_elect hash id tm dict total_stake bonuses fs grams - 3 RSHIFT# // elect credits cur_hash grams past_elect hash id tm dict total_stake bonuses fs amount - s9 s9 XCPU // elect credits cur_hash amount past_elect hash id tm dict total_stake bonuses fs grams amount - SUB // elect credits cur_hash amount past_elect hash id tm dict total_stake bonuses fs grams - s2 s9 XCHG2 // elect credits cur_hash grams past_elect hash id tm dict total_stake fs bonuses amount - ADD // elect credits cur_hash grams past_elect hash id tm dict total_stake fs bonuses - NEWC // elect credits cur_hash grams past_elect hash id tm dict total_stake fs bonuses _72 - s1 s5 XCHG // elect credits cur_hash grams past_elect hash id bonuses dict total_stake fs tm _72 - 64 STU // elect credits cur_hash grams past_elect hash id bonuses dict total_stake fs _74 - s1 s6 XCHG // elect credits cur_hash grams past_elect fs id bonuses dict total_stake hash _74 - 256 STU // elect credits cur_hash grams past_elect fs id bonuses dict total_stake _76 - s1 s2 XCHG // elect credits cur_hash grams past_elect fs id bonuses total_stake dict _76 - STDICT // elect credits cur_hash grams past_elect fs id bonuses total_stake _77 - SWAP // elect credits cur_hash grams past_elect fs id bonuses _77 total_stake - STGRAMS // elect credits cur_hash grams past_elect fs id bonuses _78 - SWAP // elect credits cur_hash grams past_elect fs id _78 bonuses - STGRAMS // elect credits cur_hash grams past_elect fs id _79 - ROT // elect credits cur_hash grams past_elect id _79 fs - STSLICER // elect credits cur_hash grams past_elect id _80 - SWAP - 32 PUSHINT - s1 s3 s3 PUXC2 // elect credits cur_hash grams id _80 id past_elect _81=32 - DICTUSETB // elect credits cur_hash grams id past_elect - FALSE // elect credits cur_hash grams id past_elect f + NULLSWAPIFNOT2 // elect credits past_elect grams cur_hash fs id f + DUP // elect credits past_elect grams cur_hash fs id f f + IF:<{ // elect credits past_elect grams cur_hash fs id f + s0 s2 XCHG // elect credits past_elect grams cur_hash f id fs + 64 LDU // elect credits past_elect grams cur_hash f id _50 fs + 256 LDU // elect credits past_elect grams cur_hash f id tm hash fs + s1 s5 PUSH2 // elect credits past_elect grams cur_hash f id tm hash fs hash cur_hash + EQUAL // elect credits past_elect grams cur_hash f id tm hash fs _56 + IF:<{ // elect credits past_elect grams cur_hash f id tm hash fs + s4 POP // elect credits past_elect grams cur_hash fs id tm hash + s0 s3 XCHG // elect credits past_elect grams cur_hash hash id tm fs + LDDICT // elect credits past_elect grams cur_hash hash id tm _60 fs + LDGRAMS // elect credits past_elect grams cur_hash hash id tm _60 _62 fs + LDGRAMS // elect credits past_elect grams cur_hash hash id tm dict total_stake bonuses fs + s8 PUSH // elect credits past_elect grams cur_hash hash id tm dict total_stake bonuses fs grams + 3 RSHIFT# // elect credits past_elect grams cur_hash hash id tm dict total_stake bonuses fs amount + s9 s9 XCPU // elect credits past_elect amount cur_hash hash id tm dict total_stake bonuses fs grams amount + SUB // elect credits past_elect amount cur_hash hash id tm dict total_stake bonuses fs grams + s2 s9 XCHG2 // elect credits past_elect grams cur_hash hash id tm dict total_stake fs bonuses amount + ADD // elect credits past_elect grams cur_hash hash id tm dict total_stake fs bonuses + s0 s4 XCHG + NEWC // elect credits past_elect grams cur_hash hash id bonuses dict total_stake fs tm _72 + 64 STU // elect credits past_elect grams cur_hash hash id bonuses dict total_stake fs _74 + s1 s6 XCHG // elect credits past_elect grams cur_hash fs id bonuses dict total_stake hash _74 + 256 STU // elect credits past_elect grams cur_hash fs id bonuses dict total_stake _76 + s1 s2 XCHG // elect credits past_elect grams cur_hash fs id bonuses total_stake dict _76 + STDICT // elect credits past_elect grams cur_hash fs id bonuses total_stake _77 + SWAP // elect credits past_elect grams cur_hash fs id bonuses _77 total_stake + STGRAMS // elect credits past_elect grams cur_hash fs id bonuses _78 + SWAP // elect credits past_elect grams cur_hash fs id _78 bonuses + STGRAMS // elect credits past_elect grams cur_hash fs id _79 + ROT // elect credits past_elect grams cur_hash id _79 fs + STSLICER // elect credits past_elect grams cur_hash id _80 + s0 s0 s4 XCPUXC + 32 PUSHINT // elect credits id grams cur_hash _80 id past_elect _81=32 + DICTUSETB // elect credits id grams cur_hash past_elect + s0 s3 XCHG + FALSE + SWAP // elect credits past_elect grams cur_hash f id }>ELSE<{ - s3 s5 XCHG - s3 s4 XCHG - 3 BLKDROP // elect credits cur_hash grams id past_elect f + 3 BLKDROP // elect credits past_elect grams cur_hash f id }> }>ELSE<{ - s3 s0 s3 XCHG3 - DROP // elect credits cur_hash grams id past_elect f + s2 POP // elect credits past_elect grams cur_hash f id }> - NOT // elect credits cur_hash grams id past_elect _84 - s1 s2 XCHG // elect credits cur_hash grams past_elect id _84 - }> // elect credits cur_hash grams past_elect id - DUP // elect credits cur_hash grams past_elect id id - ISNULL // elect credits cur_hash grams past_elect id _85 - IF:<{ // elect credits cur_hash grams past_elect id - DROP // elect credits cur_hash grams past_elect - 0 PUSHINT // elect credits cur_hash grams past_elect _86=0 - }>ELSE<{ // elect credits cur_hash grams past_elect _86 - }> // elect credits active_hash grams past_elect active_id - s0 s3 XCHG2 // elect credits past_elect grams active_id active_hash + SWAP // elect credits past_elect grams cur_hash id f + NOT // elect credits past_elect grams cur_hash id _84 + }> // elect credits past_elect grams cur_hash id + DUP // elect credits past_elect grams cur_hash id id + ISNULL // elect credits past_elect grams cur_hash id _85 + IF:<{ // elect credits past_elect grams cur_hash id + DROP // elect credits past_elect grams cur_hash + 0 PUSHINT // elect credits past_elect grams cur_hash _86=0 + }>ELSE<{ // elect credits past_elect grams cur_hash _86 + }> // elect credits past_elect grams active_hash active_id + SWAP // elect credits past_elect grams active_id active_hash store_data CALLDICT TRUE // _89 }> @@ -1463,8 +1431,7 @@ PROGRAM{ s4 PUSH 32 PUSHINT // elect credits past_elect grams active_id active_hash id past_elect _11=32 DICTUGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // elect credits past_elect grams active_id active_hash fs id f + NULLSWAPIFNOT2 // elect credits past_elect grams active_id active_hash fs id f DUP // elect credits past_elect grams active_id active_hash fs id f f IF:<{ // elect credits past_elect grams active_id active_hash fs id f s0 s2 XCHG // elect credits past_elect grams active_id active_hash f id fs @@ -1484,21 +1451,16 @@ PROGRAM{ s6 s1 s3 PUSH3 s3 s5 s8 PUSH3 // elect active_hash id past_elect active_id credits grams elect credits past_elect grams active_id active_hash store_data CALLDICT - FALSE // elect active_hash id past_elect active_id credits grams f - }>ELSE<{ - s6 s1 s5 XCHG3 - s4 s4 XCHG2 // elect active_hash id past_elect active_id credits grams f - }> + s0 s3 XCHG + s5 s4 XCHG2 + FALSE + SWAP // elect credits past_elect grams active_id active_hash f id + }> // elect credits past_elect grams active_id active_hash f id }>ELSE<{ - s3 s7 XCHG - s1 s6 XCHG - s5 s0 s5 XCHG3 - DROP // elect active_hash id past_elect active_id credits grams f + s2 POP // elect credits past_elect grams active_id active_hash f id }> - NOT // elect active_hash id past_elect active_id credits grams _26 - s2 s6 XCHG - s4 s5 XCHG - s1 s4 XCHG // elect credits past_elect grams active_id active_hash id _26 + SWAP // elect credits past_elect grams active_id active_hash id f + NOT // elect credits past_elect grams active_id active_hash id _26 }> // elect credits past_elect grams active_id active_hash id s0 s6 XCHG 6 BLKDROP // id @@ -1538,7 +1500,7 @@ PROGRAM{ 3 BLKDROP // FALSE // _27 }> // ds credits cur_vset - get_validator_conf CALLDICT // ds credits cur_vset _76 _77 _78 _79 + get_validator_conf CALLDICT // ds credits cur_vset _74 _75 _76 _77 DROP s2 POP // ds credits cur_vset elect_end_before elect_begin_before s0 s2 XCHG // ds credits elect_begin_before elect_end_before cur_vset @@ -1566,28 +1528,27 @@ PROGRAM{ 17 PUSHINT // ds credits elect_begin_before elect_end_before t _52=17 CONFIGOPTPARAM // ds credits elect_begin_before elect_end_before t _53 CTOS // ds credits elect_begin_before elect_end_before t _54 - LDGRAMS // ds credits elect_begin_before elect_end_before t _81 _80 + LDGRAMS // ds credits elect_begin_before elect_end_before t _79 _78 DROP // ds credits elect_begin_before elect_end_before t min_stake s0 s3 XCHG // ds credits min_stake elect_end_before t elect_begin_before ADD // ds credits min_stake elect_end_before elect_at - s0 DUMP // ds credits min_stake elect_end_before elect_at s0 s1 PUXC // ds credits min_stake elect_at elect_at elect_end_before SUB // ds credits min_stake elect_at elect_close - 0 PUSHINT // ds credits min_stake elect_at elect_close _62=0 - NEWDICT // ds credits min_stake elect_at elect_close _62=0 _63 - FALSE // ds credits min_stake elect_at elect_close _62=0 _63 _64 - s4 s5 XCHG + 0 PUSHINT // ds credits min_stake elect_at elect_close _60=0 + NEWDICT // ds credits min_stake elect_at elect_close _60=0 _61 s3 s4 XCHG - FALSE // ds credits elect_at elect_close min_stake _62=0 _63 _64 _65 + s2 s3 XCHG + FALSE + FALSE // ds credits elect_at elect_close min_stake _60=0 _61 _62 _63 pack_elect CALLDICT // ds credits elect - NEWC // ds credits elect _67 - STDICT // ds credits _68 - STDICT // ds _69 - SWAP // _69 ds - STSLICER // _70 - ENDC // _71 + NEWC // ds credits elect _65 + STDICT // ds credits _66 + STDICT // ds _67 + SWAP // _67 ds + STSLICER // _68 + ENDC // _69 c4 POP - TRUE // _73 + TRUE // _71 }> run_ticktock PROC:<{ // is_tock @@ -1675,28 +1636,73 @@ PROGRAM{ s2 PUSH 8 PUSHPOW2 // members l id members _28=256 DICTUGETPREV - NULLSWAPIFNOT - NULLSWAPIFNOT // members l fs id f + NULLSWAPIFNOT2 // members l fs id f DUP // members l fs id f f IF:<{ // members l fs id f s0 s2 XCHG // members l f id fs LDGRAMS // members l f id _46 _45 - DROP // members l f id _30 - s1 s(-1) PUXC // members l f id id _30 - PAIR // members l f id _32 - s0 s3 XCHG2 // members id f _32 l + DROP // members l f id _31 + s1 s(-1) PUXC // members l f id id _31 + PAIR // members l f id _30 + s0 s3 XCHG2 // members id f _30 l CONS // members id f l + s0 s2 XCHG // members l f id }>ELSE<{ - 2SWAP - DROP // members id f l + s2 POP // members l f id }> - SWAP // members id l f - NOT // members id l _34 - s1 s2 XCHG // members l id _34 + SWAP // members l id f + NOT // members l id _34 }> // members l id DROP NIP // l }> + participant_list_extended PROC:<{ + // + c4 PUSH // _1 + CTOS // _2 + PLDDICT // elect + DUP // elect elect + ISNULL // elect _4 + IFJMP:<{ // elect + DROP // + 0 PUSHINT // _5=0 + s0 s0 s0 PUSH3 // _5=0 _6=0 _7=0 _8=0 + PUSHNULL // _5=0 _6=0 _7=0 _8=0 _9 + s1 s1 PUSH2 // _5=0 _6=0 _7=0 _8=0 _9 _10=0 _11=0 + }> // elect + unpack_elect CALLDICT // elect_at elect_close min_stake total_stake members failed finished + PUSHNULL // elect_at elect_close min_stake total_stake members failed finished l + 256 PUSHPOW2DEC // elect_at elect_close min_stake total_stake members failed finished l id + UNTIL:<{ + s4 PUSH + 8 PUSHPOW2 // elect_at elect_close min_stake total_stake members failed finished l id members _34=256 + DICTUGETPREV + NULLSWAPIFNOT2 // elect_at elect_close min_stake total_stake members failed finished l cs id f + DUP // elect_at elect_close min_stake total_stake members failed finished l cs id f f + IF:<{ // elect_at elect_close min_stake total_stake members failed finished l cs id f + s0 s2 XCHG // elect_at elect_close min_stake total_stake members failed finished l f id cs + LDGRAMS // elect_at elect_close min_stake total_stake members failed finished l f id _41 cs + 32 LDU // elect_at elect_close min_stake total_stake members failed finished l f id _41 _73 _72 + NIP // elect_at elect_close min_stake total_stake members failed finished l f id _41 cs + 32 LDU // elect_at elect_close min_stake total_stake members failed finished l f id _41 _46 cs + 256 LDU // elect_at elect_close min_stake total_stake members failed finished l f id _41 _46 _49 cs + 256 LDU // elect_at elect_close min_stake total_stake members failed finished l f id stake max_factor addr adnl_addr cs + ENDS + 4 TUPLE // elect_at elect_close min_stake total_stake members failed finished l f id _57 + s1 s(-1) PUXC // elect_at elect_close min_stake total_stake members failed finished l f id id _57 + PAIR // elect_at elect_close min_stake total_stake members failed finished l f id _56 + s0 s3 XCHG2 // elect_at elect_close min_stake total_stake members failed finished id f _56 l + CONS // elect_at elect_close min_stake total_stake members failed finished id f l + s0 s2 XCHG // elect_at elect_close min_stake total_stake members failed finished l f id + }>ELSE<{ + s2 POP // elect_at elect_close min_stake total_stake members failed finished l f id + }> + SWAP // elect_at elect_close min_stake total_stake members failed finished l id f + NOT // elect_at elect_close min_stake total_stake members failed finished l id _59 + }> // elect_at elect_close min_stake total_stake members failed finished l id + DROP + s3 POP // elect_at elect_close min_stake total_stake l failed finished + }> compute_returned_stake PROC:<{ // wallet_addr c4 PUSH // wallet_addr _2 diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp index ecc0b71d8e..e3408b9db9 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.cpp @@ -1 +1 @@ -with_tvm_code("highload-wallet", "te6ccgEBBgEAhgABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQC88oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhghgBD0eG+hb6EgmALTB9QwAfsAkTLiAbPmWwGkyMsfyx/L/8ntVAAE0DAAEaCZL9qJoa4WPw=="); +with_tvm_code("highload-wallet", "te6ccgEBCAEAlwABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQC48oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhYhgBD0eG+lIJgC0wfUMAH7AJEy4gGz5lsBpMjLH8sfy//J7VQABNAwAgFIBgcAF7s5ztRNDTPzHXC/+AARuMl+1E0NcLH4"); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif index d2122a96fb..6dd5802739 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-code.fif @@ -3,6 +3,7 @@ PROGRAM{ DECLPROC recv_internal DECLPROC recv_external 85143 DECLMETHOD seqno + 78748 DECLMETHOD get_public_key recv_internal PROC:<{ // in_msg DROP // @@ -44,8 +45,7 @@ PROGRAM{ OVER 16 PUSHINT // public_key stored_seqno stored_subwallet dict i dict _57=16 DICTIGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // public_key stored_seqno stored_subwallet dict cs i f + NULLSWAPIFNOT2 // public_key stored_seqno stored_subwallet dict cs i f DUP // public_key stored_seqno stored_subwallet dict cs i f f IF:<{ // public_key stored_seqno stored_subwallet dict cs i f s0 s2 XCHG // public_key stored_seqno stored_subwallet dict f i cs @@ -76,4 +76,12 @@ PROGRAM{ CTOS // _1 32 PLDU // _3 }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 64 LDU // _9 _8 + NIP // cs + 256 PLDU // _7 + }> }END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp index ca5d2c70f7..ca5daab551 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.cpp @@ -1 +1 @@ -with_tvm_code("highoad-wallet-v2", "te6ccgEBBwEA1wABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQHu8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44YIYAQ9HhvoW+hIJgC0wfUMAH7AJEy4gGz5luDJaHIQDSAQPRDiuYxyBLLHxPLP8v/9ADJ7VQGAATQMABBoZfl2omhpj5jpn+n/mPoCaKkQQCB6BzfQmMktv8ld0fFADoggED0lm+hb6EyURCUMFMDud4gkjM2k0MTW+IBsw=="); +with_tvm_code("highload-wallet-v2", "te6ccgEBCQEA5QABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQHq8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44WIYAQ9HhvpSCYAtMH1DAB+wCRMuIBs+ZbgyWhyEA0gED0Q4rmMQHIyx8Tyz/L//QAye1UCAAE0DACASAGBwAXvZznaiaGmvmOuF/8AEG+X5dqJoaY+Y6Z/p/5j6AmipEEAgegc30JjJLb/JXdHxQANCCAQPSWb6VsEiCUMFMDud4gkzM2AZJsIeKz"); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif index 9d5e467de5..5b2c64e0e2 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/highload-wallet-v2-code.fif @@ -3,6 +3,7 @@ PROGRAM{ DECLPROC recv_internal DECLPROC recv_external 117746 DECLMETHOD processed? + 78748 DECLMETHOD get_public_key recv_internal PROC:<{ // in_msg DROP // @@ -49,8 +50,7 @@ PROGRAM{ OVER 16 PUSHINT // last_cleaned public_key old_queries query_id stored_subwallet bound dict i dict _62=16 DICTIGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f + NULLSWAPIFNOT2 // last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f DUP // last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f f IF:<{ // last_cleaned public_key old_queries query_id stored_subwallet bound dict cs i f s0 s2 XCHG // last_cleaned public_key old_queries query_id stored_subwallet bound dict f i cs @@ -76,10 +76,9 @@ PROGRAM{ DUP 64 PUSHINT // last_cleaned public_key stored_subwallet bound old_queries old_queries _85=64 DICTUREMMIN - NULLSWAPIFNOT - NULLSWAPIFNOT // last_cleaned public_key stored_subwallet bound old_queries _126 _128 _127 _129 - s2 POP // last_cleaned public_key stored_subwallet bound old_queries old_queries' f i - s1 s0 XCPU // last_cleaned public_key stored_subwallet bound old_queries old_queries' i f f + NULLSWAPIFNOT2 // last_cleaned public_key stored_subwallet bound old_queries _126 _128 _127 _129 + 1 2 BLKDROP2 // last_cleaned public_key stored_subwallet bound old_queries old_queries' i f + DUP // last_cleaned public_key stored_subwallet bound old_queries old_queries' i f f IF:<{ // last_cleaned public_key stored_subwallet bound old_queries old_queries' i f DROP // last_cleaned public_key stored_subwallet bound old_queries old_queries' i s0 s3 PUSH2 // last_cleaned public_key stored_subwallet bound old_queries old_queries' i i bound @@ -89,16 +88,15 @@ PROGRAM{ IF:<{ // last_cleaned public_key stored_subwallet bound old_queries old_queries' i f s3 POP s6 POP // last_cleaned public_key stored_subwallet bound f old_queries + SWAP // last_cleaned public_key stored_subwallet bound old_queries f }>ELSE<{ - s3 s1 s3 XCHG3 - 2DROP // last_cleaned public_key stored_subwallet bound f old_queries + 2 1 BLKDROP2 // last_cleaned public_key stored_subwallet bound old_queries f }> - SWAP // last_cleaned public_key stored_subwallet bound old_queries f NOT // last_cleaned public_key stored_subwallet bound old_queries _90 }> // last_cleaned public_key stored_subwallet bound old_queries NIP // last_cleaned public_key stored_subwallet old_queries - NEWC // last_cleaned public_key stored_subwallet old_queries _91 - s1 s2 XCHG // last_cleaned public_key old_queries stored_subwallet _91 + SWAP + NEWC // last_cleaned public_key old_queries stored_subwallet _91 32 STU // last_cleaned public_key old_queries _93 s1 s3 XCHG // old_queries public_key last_cleaned _93 64 STU // old_queries public_key _95 @@ -131,4 +129,12 @@ PROGRAM{ NEGATE // _24 }> }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 96 LDU // _11 _10 + NIP // cs + 256 PLDU // _9 + }> }END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp index 39ac8a7f6f..4c55e58f32 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.cpp @@ -1 +1 @@ -with_tvm_code("multisig", "te6ccgECMAEAA2oAART/APSkE/Sg8sgLAQIBIAIDAgFICAkEwPIgxwCOgzDbPOCDCNcYIPkBAdMH2zwiwAAToVNhePQOb6Hyn9cL/0iQ+RDyoAP0BCD5AQHTP/gjqh9TILnyYVMngED0Dm+hECNUSADbPAquXLDyYrEBpPgAVDiTVHo5KxcvFgQEnts8VHCrU5rbPO1U+A9wJm5TqL6xmBA6EHlQdl8GiuIEgyWhjichgED0lm+hb6EyURCUMFMCud4glDQ2N3+XEEkQR0QUW+ICsxBXECXmMAMaHwUGAiowKkZTBts8UHegECQQN0EGU1bbPH8kGgEKipJfBeIHAQwQJNs87VQfAgLNCgsCASAbHAIBIAwNAgEgEhMCASAODwIBIBARAAMMIAEBIC8BASAfAQEgJAIBIBQVAgEgGBkBASAWAQEgFwA4jhXSAAHyo9MHWNcBIPkBBPkBFLrypFjgW3BSAgIc2zwC8mX4AFpxAts87VQvHwEBIBoATwhbpEx4CBukTDgAdAg10rDAJrUAvAHyFjPFszJ4HHXI8gBzxb0AMmAAaFIwvo4aXwOTIddKmAHTB9QC+wAB6DFwyMoAAoBA9EOOEnHIywATywdYzwFYzxYCgED0Q+ICASAdHgIBICUmARO77ZbVAjcFnbPIHwIBSCAhABjIywfLB8s/9AD0AMkCASAiIwF5sR10IMI1xgg+QEB0weCAdTE7UPYUyB49A5vofKf1wv/XjH5EPKgrgH0BCFulhAjXwNxAeD5AVjbPAGkAYCQAPa7agOgA6AD6AgF6AhH8gID8gN15T/gD5HoAAOeLZMAAFa4ZV0EA1WZ2oexAAGBwjikD0IMI1xjTB/QEMFMWePQOb6HypdcL/1RFRPkQ8qauUiCxUgO9FKEjbuYyMjICASAnKAIBSCkqAVW3JVtnhiZQCAqIhn6BzfQxwmYmQDpAADMaYOYuAFrgJhwLb+4cBgY3dG4QLwGNtVmbZ4Br4G/tscbqIlAIHo+N9C30JBHEgFpAADHDRA8a5CTa4GT2E5kAOeLAMAgKiCq+iHJCZhxSQmYcUktGHEA2fMCL4JAvAgEgKywCA5k4LS4BDawabZ4vgcAvABWt+UEAzJV2oewYQAENqTbPBRfBIC8AFa3cLOCAarM7UPYgABztRNDTB9MH0z/0BPQE0Q=="); +with_tvm_code("multisig", "te6ccgECKAEAA+YAART/APSkE/S88sgLAQIBIAIDAgFIBAUE3vIgxwCOgzDbPOCDCNcYIPkBAdMH2zwiwAAToVNxePQOb6EB2zwC8p9UGrv5EPKgBvQEIPkBAdMfURi68qrTP3BTAfAJAcIIAYMKvLHyaFMVgED0Dm+hIJgNpCDCCvJnDd/4I6ofU0C58mFUI6NTThweJB0CAswGBwIBIAoLAAPZhAIBSAgJAC1QKkItdJEqCTItdKlwLUAdAT8AnobBKABPQhbpEx4CBukTDgAdAg10rDAJrUAvAKyFjPFszJ4HHXI8gBzxb0AMmAIBIAwNAgEgEhMBFbvtltUDRwVSDbPIJwIBSA4PAgEgEBEBc7EddCDCNcYIPkBAdMHggHUxO1D2FMgePQOb6Hyn9cL/14x+RDyoK4B9AQhbpNbcTLg+QFY2zwBpAGAhAD2u2oDoAOgA+gIBegIR/ICA/IDdeU/4BWR6AADni2TAABWuGVdBANVmdqHsQAIBIBQVAgFIFhcBUbclW2eGJkZqRhAIHoHN9DHCTYRaQAAzGmHmLgBa4CYcC2/uHAt3dG4QHgGHtVmbZ4ar4G/tscaKInAIHo+N9KQRxGBaQAAxw0QQAhrkJLrgZPYTmQA54sqEAJAIHohgUiYcUiYcUiZcQDZiXMCL4JAeAgEgGBkCA5k4GhsBEawabZ4vgbYJQB4AFa35QQDMlXah7BhAAQ2pNs8FV8FgHgAVrdws4IBqsztQ9iACINs8AvJl+ABQQ3FDE9s87VQeJwSo2zwvrlMgsPJiErECpIIBhqD4AQWXAhEQAj4+MI6jAREQAQ/bPEDXePRDUxe5JoIgDhAAAAAAoCS8sPJpEL0QvAXiVBZbVHPnVhBT3Ns8VHEKVHq8HyUiIAAg7UTQ0x/TB9MH0z/0BPQE0QBIAY4aMNIAAfKj0wfTB1AD1wEg+QEF+QEVuvKkUAPgbCFwVCATBLjbPO1U+A9wJW5Tib6xmBBuEC1Qx18HjxswVCQDUE3bPFBVoEZQEEkQOksJU7nbPFBUFn/i+AAHgyWhjh0mgED0lm+lbBIglDBTArneIJY3OH85BwWSbCHis+YwBichIiMAYHCOKQPQgwjXGNMH9AQwUxZ49A5vofKl1wv/VEVE+RDypq5SILFSA70UoSNu5mwiMgKaUjC+jy5fA/gAkyLXSpgC0wfUAvsAAugycMjKAEAUgED0Q1MhePQOb6Ew2zyl2zxaePRDjhdxyMsAFMsHEssHWM8BWM8WQBOAQPRDAeIkJQEKipJfBuImAArT/9MHMAAMAcjL/8sHARQQRRA0QwDbPO1UJwAcyMsfywfLB8s/9AD0AMk="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif index ce1c21bf08..14c6db1115 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/multisig-code.fif @@ -2,11 +2,14 @@ PROGRAM{ DECLPROC unpack_state DECLPROC pack_state + DECLPROC pack_owner_info + DECLPROC unpack_owner_info DECLPROC check_signatures DECLPROC recv_internal DECLPROC unpack_query_data DECLPROC try_init DECLPROC update_pending_queries + DECLPROC calc_boc_size DECLPROC recv_external 104746 DECLMETHOD get_query_state 117746 DECLMETHOD processed? @@ -23,22 +26,37 @@ PROGRAM{ // c4 PUSH // _1 CTOS // ds - 8 LDU // _4 ds + 32 LDU // _4 ds 8 LDU // _4 _7 ds - 64 LDU // _4 _7 _10 ds - LDDICT // _4 _7 _10 _13 ds - LDDICT // res res res res res ds + 8 LDU // _4 _7 _10 ds + 64 LDU // _4 _7 _10 _13 ds + LDDICT // _4 _7 _10 _13 _16 ds + LDDICT // res res res res res res ds ENDS }> pack_state PROCREF:<{ - // pending_queries public_keys last_cleaned k n - NEWC // pending_queries public_keys last_cleaned k n _5 - 8 STU // pending_queries public_keys last_cleaned k _7 - 8 STU // pending_queries public_keys last_cleaned _9 - 64 STU // pending_queries public_keys _11 - STDICT // pending_queries _12 - STDICT // _13 - ENDC // _14 + // pending_queries owner_infos last_cleaned k n wallet_id + NEWC // pending_queries owner_infos last_cleaned k n wallet_id _6 + 32 STU // pending_queries owner_infos last_cleaned k n _8 + 8 STU // pending_queries owner_infos last_cleaned k _10 + 8 STU // pending_queries owner_infos last_cleaned _12 + 64 STU // pending_queries owner_infos _14 + STDICT // pending_queries _15 + STDICT // _16 + ENDC // _17 + }> + pack_owner_info PROCREF:<{ + // public_key flood + SWAP + NEWC // flood public_key _2 + 256 STU // flood _4 + 8 STU // _6 + }> + unpack_owner_info PROCREF:<{ + // cs + 256 LDU // _1 cs + 8 LDU // _1 _10 _9 + DROP // _1 _4 }> check_signatures PROCREF:<{ // public_keys signatures hash cnt_bits @@ -70,8 +88,7 @@ PROGRAM{ s3 PUSH // public_keys signatures hash cnt_bits cnt signatures ISNULL // public_keys signatures hash cnt_bits cnt _37 }> // public_keys signatures hash cnt_bits cnt - s2 POP - s2 POP + 2 2 BLKDROP2 s2 POP // cnt cnt_bits }> recv_internal PROC:<{ @@ -79,78 +96,117 @@ PROGRAM{ DROP // }> unpack_query_data PROCREF:<{ - // in_msg n query found? - IFJMP:<{ // in_msg n query - 1 LDI // in_msg n _5 query - SWAP // in_msg n query _5 + // in_msg n query found? root_i + SWAP // in_msg n query root_i found? + IFJMP:<{ // in_msg n query root_i + DROP // in_msg n query + 1 LDI // in_msg n _6 query + SWAP // in_msg n query _6 35 THROWIFNOT - 8 LDU // in_msg n _12 query - ROT // in_msg _12 query n - LDUX // in_msg cnt cnt_bits msg - DUP // in_msg cnt cnt_bits msg msg - HASHSU // in_msg cnt cnt_bits msg _18 - s0 s4 XCHG // _18 cnt cnt_bits msg in_msg - HASHSU // _18 cnt cnt_bits msg _19 - s1 s4 XCHG // msg cnt cnt_bits _18 _19 - EQUAL // msg cnt cnt_bits _20 + 8 LDU // in_msg n _14 query + 8 LDU // in_msg n _14 _17 query + s0 s3 XCHG2 // in_msg _17 _14 query n + LDUX // in_msg cnt creator_i cnt_bits msg + DUP // in_msg cnt creator_i cnt_bits msg msg + HASHSU // in_msg cnt creator_i cnt_bits msg _23 + s0 s5 XCHG // _23 cnt creator_i cnt_bits msg in_msg + HASHSU // _23 cnt creator_i cnt_bits msg _24 + s1 s5 XCHG // msg cnt creator_i cnt_bits _23 _24 + EQUAL // msg cnt creator_i cnt_bits _25 36 THROWIFNOT - ROT // cnt cnt_bits msg - }> // in_msg n query - 2DROP // in_msg - 0 PUSHINT // in_msg _22=0 - s0 s1 PUXC // _22=0 _23=0 in_msg + s0 s3 XCHG2 // creator_i cnt cnt_bits msg + }> // in_msg n query root_i + 2 1 BLKDROP2 // in_msg root_i + 0 PUSHINT // in_msg root_i _27=0 + s0 s1 s2 XCPUXC // root_i _27=0 _28=0 in_msg }> try_init PROCREF:<{ // - unpack_state INLINECALLDICT // n k last_cleaned public_keys pending_queries - s0 s2 XCHG // n k pending_queries public_keys last_cleaned + unpack_state INLINECALLDICT // wallet_id n k last_cleaned owner_infos pending_queries + s0 s2 XCHG // wallet_id n k pending_queries owner_infos last_cleaned 37 THROWIF ACCEPT - 2SWAP + s4 s3 XCHG2 1 PUSHINT - s0 s2 XCHG // pending_queries public_keys _9=1 k n - pack_state INLINECALLDICT // _10 + s3 s1 s3 XCHG3 // pending_queries owner_infos _10=1 k n wallet_id + pack_state INLINECALLDICT // _11 c4 POP }> update_pending_queries PROCREF:<{ - // pending_queries msg query_id cnt cnt_bits n k - s3 s(-1) PUXC // pending_queries msg query_id cnt cnt_bits n cnt k - GEQ // pending_queries msg query_id cnt cnt_bits n _7 - IF:<{ // pending_queries msg query_id cnt cnt_bits n - 3 BLKDROP // pending_queries msg query_id + // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n k + s3 s(-1) PUXC // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n cnt k + GEQ // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _9 + IF:<{ // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n + 3 BLKDROP // pending_queries owner_infos msg query_id creator_i + ACCEPT WHILE:<{ - OVER // pending_queries msg query_id msg - SREFS // pending_queries msg query_id _8 - }>DO<{ // pending_queries msg query_id - SWAP // pending_queries query_id msg - 8 LDU // pending_queries query_id mode msg - LDREF // pending_queries query_id mode _13 msg - s0 s2 XCHG // pending_queries query_id msg _13 mode + s2 PUSH // pending_queries owner_infos msg query_id creator_i msg + SREFS // pending_queries owner_infos msg query_id creator_i _11 + }>DO<{ // pending_queries owner_infos msg query_id creator_i + s0 s2 XCHG // pending_queries owner_infos creator_i query_id msg + 8 LDU // pending_queries owner_infos creator_i query_id mode msg + LDREF // pending_queries owner_infos creator_i query_id mode _16 msg + s0 s2 XCHG // pending_queries owner_infos creator_i query_id msg _16 mode SENDRAWMSG - SWAP // pending_queries msg query_id - }> // pending_queries msg query_id - NIP // pending_queries query_id - 0 PUSHINT // pending_queries query_id _17=0 - NEWC // pending_queries query_id _17=0 _18 - 1 STI // pending_queries query_id _20 - s0 s2 XCHG - 64 PUSHINT // _20 query_id pending_queries _21=64 - DICTUSETB // pending_queries - }>ELSE<{ // pending_queries msg query_id cnt cnt_bits n - 1 PUSHINT // pending_queries msg query_id cnt cnt_bits n _24=1 - NEWC // pending_queries msg query_id cnt cnt_bits n _24=1 _25 - 1 STU // pending_queries msg query_id cnt cnt_bits n _27 - s1 s3 XCHG // pending_queries msg query_id n cnt_bits cnt _27 - 8 STU // pending_queries msg query_id n cnt_bits _29 - ROT // pending_queries msg query_id cnt_bits _29 n - STUX // pending_queries msg query_id _30 - ROT // pending_queries query_id _30 msg - STSLICER // pending_queries query_id _31 - s0 s2 XCHG - 64 PUSHINT // _31 query_id pending_queries _32=64 - DICTUSETB // pending_queries + s0 s2 XCHG // pending_queries owner_infos msg query_id creator_i + }> // pending_queries owner_infos msg query_id creator_i + s2 POP // pending_queries owner_infos creator_i query_id + 0 PUSHINT // pending_queries owner_infos creator_i query_id _20=0 + NEWC // pending_queries owner_infos creator_i query_id _20=0 _21 + 1 STI // pending_queries owner_infos creator_i query_id _23 + s0 s1 s4 XCHG3 + 64 PUSHINT // creator_i owner_infos _23 query_id pending_queries _24=64 + DICTUSETB // creator_i owner_infos pending_queries + s2 s1 PUSH2 + 8 PUSHINT // creator_i owner_infos pending_queries creator_i owner_infos _28=8 + DICTUGET + NULLSWAPIFNOT // creator_i owner_infos pending_queries _56 _57 + DROP // creator_i owner_infos pending_queries owner_info + unpack_owner_info INLINECALLDICT // creator_i owner_infos pending_queries public_key flood + DEC // creator_i owner_infos pending_queries public_key _35 + pack_owner_info INLINECALLDICT // creator_i owner_infos pending_queries _36 + 2SWAP + 8 PUSHINT // pending_queries _36 creator_i owner_infos _37=8 + DICTUSETB // pending_queries owner_infos + }>ELSE<{ // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n + 1 PUSHINT // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _40=1 + NEWC // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _40=1 _41 + 1 STU // pending_queries owner_infos msg query_id creator_i cnt cnt_bits n _43 + s1 s4 XCHG // pending_queries owner_infos msg query_id n cnt cnt_bits creator_i _43 + 8 STU // pending_queries owner_infos msg query_id n cnt cnt_bits _45 + s1 s2 XCHG // pending_queries owner_infos msg query_id n cnt_bits cnt _45 + 8 STU // pending_queries owner_infos msg query_id n cnt_bits _47 + ROT // pending_queries owner_infos msg query_id cnt_bits _47 n + STUX // pending_queries owner_infos msg query_id _48 + ROT // pending_queries owner_infos query_id _48 msg + STSLICER // pending_queries owner_infos query_id _49 + s0 s1 s3 XCHG3 + 64 PUSHINT // owner_infos _49 query_id pending_queries _50=64 + DICTUSETB // owner_infos pending_queries + SWAP // pending_queries owner_infos }> }> + calc_boc_size PROC:<{ + // cells bits root + s0 s2 XCHG // root bits cells + INC // root bits cells + s2 PUSH // root bits cells root + SBITS // root bits cells _5 + s1 s2 XCHG // root cells bits _5 + ADD // root cells bits + WHILE:<{ + s2 PUSH // root cells bits root + SREFS // root cells bits _7 + }>DO<{ // root cells bits + s0 s2 XCHG // bits cells root + LDREF // bits cells _8 root + SWAP // bits cells root _8 + CTOS // bits cells root _10 + s1 s3 XCHG // root cells bits _10 + calc_boc_size CALLDICT // root cells bits + }> // root cells bits + 1 2 BLKDROP2 // cells bits + }> recv_external PROC:<{ // in_msg DUP // in_msg in_msg @@ -165,157 +221,209 @@ PROGRAM{ HASHSU // root_signature in_msg root_hash SWAP // root_signature root_hash in_msg 8 LDU // root_signature root_hash root_i in_msg - unpack_state INLINECALLDICT // root_signature root_hash root_i in_msg n k last_cleaned public_keys pending_queries - s2 PUSH // root_signature root_hash root_i in_msg n k last_cleaned public_keys pending_queries last_cleaned - 0 EQINT // root_signature root_hash root_i in_msg n k last_cleaned public_keys pending_queries _20 - s1 s3 XCHG // root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned _20 - SUB // root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned - s6 s1 PUSH2 - 8 PUSHINT // root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned root_i public_keys _24=8 + unpack_state INLINECALLDICT // root_signature root_hash root_i in_msg wallet_id n k last_cleaned owner_infos pending_queries + s2 PUSH // root_signature root_hash root_i in_msg wallet_id n k last_cleaned owner_infos pending_queries last_cleaned + 0 EQINT // root_signature root_hash root_i in_msg wallet_id n k last_cleaned owner_infos pending_queries _21 + s1 s3 XCHG // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned _21 + SUB // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned + s7 s1 PUSH2 + 8 PUSHINT // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned root_i owner_infos _25=8 DICTUGET - NULLSWAPIFNOT // root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned public_key found? + NULLSWAPIFNOT // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned owner_info found? + SWAP // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned found? owner_info + unpack_owner_info INLINECALLDICT // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned found? public_key flood + s0 s2 XCHG // root_signature root_hash root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned flood public_key found? 31 THROWIFNOT - 256 PLDU // root_signature root_hash root_i in_msg n k pending_queries public_keys last_cleaned _30 - s8 s9 s0 XCHG3 // last_cleaned public_keys root_i in_msg n k pending_queries root_hash root_signature _30 - CHKSIGNU // last_cleaned public_keys root_i in_msg n k pending_queries _31 + s10 s11 s11 XC2PU // public_key flood root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned root_hash root_signature public_key + CHKSIGNU // public_key flood root_i in_msg wallet_id n k pending_queries owner_infos last_cleaned _33 32 THROWIFNOT - s0 s3 XCHG // last_cleaned public_keys root_i pending_queries n k in_msg - LDDICT // last_cleaned public_keys root_i pending_queries n k signatures in_msg - DUP // last_cleaned public_keys root_i pending_queries n k signatures in_msg in_msg - HASHSU // last_cleaned public_keys root_i pending_queries n k signatures in_msg hash - SWAP // last_cleaned public_keys root_i pending_queries n k signatures hash in_msg - 64 LDU // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg - NOW // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg _43 - 32 LSHIFT# // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound - s2 s0 PUSH2 // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound query_id bound - LESS // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound _47 - 33 THROWIF - s2 s7 PUSH2 - 64 PUSHINT // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound query_id pending_queries _51=64 + s0 s6 XCHG // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos in_msg + LDDICT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures in_msg + DUP // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures in_msg in_msg + HASHSU // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures in_msg hash + SWAP // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash in_msg + 32 LDU // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_wallet_id in_msg + s1 s8 XCPU // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash in_msg query_wallet_id wallet_id + EQUAL // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash in_msg _45 + 42 THROWIFNOT + 64 LDU // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg + 0 PUSHINT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _53=0 + s0 s1 PUSH2 // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _53=0 _54=0 in_msg + calc_boc_size CALLDICT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg cnt bits + SWAP // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg bits cnt + 8 GTINT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg bits _58 + SWAP + 11 PUSHPOW2 // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _58 bits _59=2048 + GREATER // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _58 _60 + OR // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg _61 + 40 THROWIF + s1 s5 PUSH2 + 64 PUSHINT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query_id pending_queries _65=64 DICTUGET - NULLSWAPIFNOT // last_cleaned public_keys root_i pending_queries n k signatures hash query_id in_msg bound query found? - s2 s3 XCHG - s8 s(-1) s(-1) PUXC2 // last_cleaned public_keys root_i pending_queries n k signatures hash query_id bound in_msg n query found? - unpack_query_data INLINECALLDICT // last_cleaned public_keys root_i pending_queries n k signatures hash query_id bound cnt cnt_bits msg - s0 s10 XCHG // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits root_i - POW2 // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits mask - 2DUP // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits mask cnt_bits mask - AND // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits mask _61 + NULLSWAPIFNOT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? + DUP // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? found? + IFNOT:<{ // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? + s0 s13 XCHG // public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood + INC // public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood + DUP // public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood flood + 10 GTINT // public_key found? root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query flood _71 + 39 THROWIF + s0 s13 XCHG // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? + }> // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? + NOW // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? _74 + 32 LSHIFT# // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? bound + s4 s0 PUSH2 // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? bound query_id bound + LESS // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id in_msg query found? bound _78 + 33 THROWIF + s3 s10 s2 XCPUXC + s4 s14 PUSH2 // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound in_msg n query found? root_i + unpack_query_data INLINECALLDICT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg + s15 PUSH // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg root_i + POW2 // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg mask + s2 s0 PUSH2 // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg mask cnt_bits mask + AND // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt cnt_bits msg mask _89 34 THROWIF - OR // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt cnt_bits - SWAP // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt_bits cnt - INC // last_cleaned public_keys msg pending_queries n k signatures hash query_id bound cnt_bits cnt - ACCEPT - s8 s9 s3 XCPU2 - s10 s3 s9 PUSH3 - s11 PUSH // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries msg query_id cnt cnt_bits n k - update_pending_queries INLINECALLDICT // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries - s0 s10 s11 PUSH3 - s9 s10 PUSH2 // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries pending_queries public_keys last_cleaned k n - pack_state INLINECALLDICT // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries _68 + s1 s2 XCHG // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt msg cnt_bits mask + OR // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt msg cnt_bits + s0 s2 XCHG // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt_bits msg cnt + INC // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt_bits msg cnt + 100000 PUSHINT // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id found? bound creator_i cnt_bits msg cnt _94=100000 + SETGASLIMIT + s0 s5 XCHG // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i cnt_bits msg found? + IFNOT:<{ // public_key flood root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i cnt_bits msg + s1 16 s() XCHG + s0 s15 XCHG // cnt_bits msg root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i public_key flood + pack_owner_info INLINECALLDICT // cnt_bits msg root_i last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound creator_i _97 + s0 s13 s7 XCHG3 + 8 PUSHINT // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt _97 root_i owner_infos _98=8 + DICTUSETB // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos + s1 s7 PUSH2 // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos cnt k + LESS // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 + s6 PUSH + 15461882265600 PUSHINT // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 bound _106 + ADD // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 _107 + s4 PUSH // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 _107 query_id + GREATER // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _101 _108 + AND // cnt_bits msg creator_i last_cleaned wallet_id n k pending_queries bound signatures hash query_id cnt owner_infos _109 + 41 THROWIF + s11 s13 XCHG + s11 s12 XCHG + s0 s5 XCHG // creator_i cnt_bits msg last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound + }>ELSE<{ + s2 16 s() XCHG + s14 POP + s14 POP + DROP // creator_i cnt_bits msg last_cleaned wallet_id n k pending_queries owner_infos signatures hash query_id cnt bound + }> + s6 s5 s11 XC2PU + s3 s14 s7 PUSH3 + 16 s() PUSH + s13 s12 PUSH2 // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos msg query_id creator_i cnt cnt_bits n k + update_pending_queries INLINECALLDICT // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos + s1 s0 s10 PUSH3 + s10 s11 s12 PUSH3 // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos pending_queries owner_infos last_cleaned k n wallet_id + pack_state INLINECALLDICT // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos _112 c4 POP COMMIT - 0 PUSHINT // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 - s6 PUSH // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 signatures - ISNULL // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _73 - s10 s8 PUSH2 // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _73 cnt k - GEQ // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _73 _74 - OR // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 _75 - IFNOT:<{ // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries need_save=0 - DROP // last_cleaned public_keys msg cnt n k signatures hash query_id bound cnt_bits pending_queries - s10 PUSH - s6 s5 s3 XCHG3 - s0 s6 XCHG // last_cleaned public_keys msg cnt n k bound pending_queries query_id public_keys signatures hash cnt_bits - check_signatures INLINECALLDICT // last_cleaned public_keys msg cnt n k bound pending_queries query_id new_cnt cnt_bits - s7 s7 XCHG2 // last_cleaned public_keys msg cnt_bits n k bound pending_queries query_id cnt new_cnt - ADD // last_cleaned public_keys msg cnt_bits n k bound pending_queries query_id cnt - s2 s4 XCHG - s3 s7 XCHG - s1 s0 s6 XCHG3 - s5 s6 PUSH2 // last_cleaned public_keys bound k n pending_queries msg query_id cnt cnt_bits n k - update_pending_queries INLINECALLDICT // last_cleaned public_keys bound k n pending_queries - -1 PUSHINT // last_cleaned public_keys bound k n pending_queries need_save=-1 - }>ELSE<{ + 0 PUSHINT // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 + s5 PUSH // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 signatures + ISNULL // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _117 + s8 s9 PUSH2 // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _117 cnt k + GEQ // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _117 _118 + OR // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 _119 + IFNOT:<{ // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos need_save=0 + DROP // creator_i cnt_bits msg last_cleaned wallet_id n k cnt bound signatures hash query_id pending_queries owner_infos + s4 s0 s2 XCPUXC + s4 s13 XCHG2 // creator_i query_id msg last_cleaned wallet_id n k cnt bound pending_queries owner_infos owner_infos signatures hash cnt_bits + check_signatures INLINECALLDICT // creator_i query_id msg last_cleaned wallet_id n k cnt bound pending_queries owner_infos new_cnt cnt_bits + s5 s5 XCHG2 // creator_i query_id msg last_cleaned wallet_id n k cnt_bits bound pending_queries owner_infos cnt new_cnt + ADD // creator_i query_id msg last_cleaned wallet_id n k cnt_bits bound pending_queries owner_infos cnt + s6 s5 s0 XCHG3 + s4 s9 XCHG s3 s10 XCHG - s7 s9 XCHG - s7 s6 XCHG2 - 6 BLKDROP // last_cleaned public_keys bound k n pending_queries need_save + s11 s0 s9 XCHG3 + s11 s9 PUSH2 // n bound k last_cleaned wallet_id pending_queries owner_infos msg query_id creator_i cnt cnt_bits n k + update_pending_queries INLINECALLDICT // n bound k last_cleaned wallet_id pending_queries owner_infos + s5 s4 XCHG2 + s1 s6 XCHG + -1 PUSHINT // bound pending_queries owner_infos last_cleaned wallet_id n k need_save=-1 + }>ELSE<{ + s6 s14 XCHG + s2 s13 XCHG + s12 s7 XCHG2 + 7 BLKDROP // bound pending_queries owner_infos last_cleaned wallet_id n k need_save }> - s0 s4 XCHG - 38 PUSHPOW2 // last_cleaned public_keys need_save k n pending_queries bound _83 - SUB // last_cleaned public_keys need_save k n pending_queries bound + ACCEPT + s0 s7 XCHG + 38 PUSHPOW2 // need_save pending_queries owner_infos last_cleaned wallet_id n k bound _128 + SUB // need_save pending_queries owner_infos last_cleaned wallet_id n k bound UNTIL:<{ - OVER - 64 PUSHINT // last_cleaned public_keys need_save k n pending_queries bound pending_queries _90=64 + s6 PUSH + 64 PUSHINT // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries _135=64 DICTUREMMIN - NULLSWAPIFNOT - NULLSWAPIFNOT // last_cleaned public_keys need_save k n pending_queries bound _121 _123 _122 _124 - s2 POP // last_cleaned public_keys need_save k n pending_queries bound pending_queries' f i - s1 s0 XCPU // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f f - IF:<{ // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f - DROP // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i - s0 s2 PUSH2 // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i i bound - LESS // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f - }> // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f - DUP // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f f - IF:<{ // last_cleaned public_keys need_save k n pending_queries bound pending_queries' i f - s4 POP - s6 POP - s7 POP // pending_queries public_keys last_cleaned k n f bound - -1 PUSHINT // pending_queries public_keys last_cleaned k n f bound need_save=-1 + NULLSWAPIFNOT2 // need_save pending_queries owner_infos last_cleaned wallet_id n k bound _178 _180 _179 _181 + 1 2 BLKDROP2 // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f + DUP // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f f + IF:<{ // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f + DROP // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i + s0 s2 PUSH2 // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i i bound + LESS // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f + }> // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f + DUP // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f f + IF:<{ // need_save pending_queries owner_infos last_cleaned wallet_id n k bound pending_queries' i f + s7 POP + s8 POP + -1 PUSHINT + s9 POP + s0 s7 XCHG + s0 s5 XCHG // need_save=-1 pending_queries owner_infos last_cleaned wallet_id n k bound f }>ELSE<{ - s4 s9 XCHG - s4 s7 XCHG - s4 s1 s4 XCHG3 - 2DROP // pending_queries public_keys last_cleaned k n f bound need_save + 2 1 BLKDROP2 // need_save pending_queries owner_infos last_cleaned wallet_id n k bound f }> - s0 s2 XCHG // pending_queries public_keys last_cleaned k n need_save bound f - NOT // pending_queries public_keys last_cleaned k n need_save bound _96 - s5 s7 XCHG - s2 s5 XCHG // last_cleaned public_keys need_save k n pending_queries bound _96 - }> // last_cleaned public_keys need_save k n pending_queries bound - DROP // last_cleaned public_keys need_save k n pending_queries - s0 s3 XCHG // last_cleaned public_keys pending_queries k n need_save - IF:<{ // last_cleaned public_keys pending_queries k n - s2 s4 XCHG // pending_queries public_keys last_cleaned k n - pack_state INLINECALLDICT // _97 + NOT // need_save pending_queries owner_infos last_cleaned wallet_id n k bound _141 + }> // need_save pending_queries owner_infos last_cleaned wallet_id n k bound + DROP // need_save pending_queries owner_infos last_cleaned wallet_id n k + s0 s6 XCHG // k pending_queries owner_infos last_cleaned wallet_id n need_save + IF:<{ // k pending_queries owner_infos last_cleaned wallet_id n + s4 s5 XCHG + s3 s4 XCHG + s3 s0 s0 XCHG3 // pending_queries owner_infos last_cleaned k n wallet_id + pack_state INLINECALLDICT // _142 c4 POP }>ELSE<{ - 5 BLKDROP // + 6 BLKDROP // }> }> get_query_state PROC:<{ // query_id - unpack_state INLINECALLDICT // query_id _25 _26 _27 _28 _29 + unpack_state INLINECALLDICT // query_id _28 _29 _30 _31 _32 _33 NIP - s2 POP // query_id n pending_queries last_cleaned - 64 PUSHINT // query_id n pending_queries last_cleaned _9=64 - s4 s2 s2 PUXC2 // query_id n last_cleaned query_id pending_queries _9=64 + s2 POP + s3 POP // query_id last_cleaned n pending_queries + s3 s(-1) PUXC + 64 PUSHINT // query_id last_cleaned n query_id pending_queries _10=64 DICTUGET - NULLSWAPIFNOT // query_id n last_cleaned cs found - IFJMP:<{ // query_id n last_cleaned cs - NIP - s2 POP // cs n - SWAP // n cs - 1 LDI // n _11 cs - SWAP // n cs _11 + NULLSWAPIFNOT // query_id last_cleaned n cs found + IFJMP:<{ // query_id last_cleaned n cs + 2 2 BLKDROP2 // n cs + 1 LDI // n _12 cs + SWAP // n cs _12 IFJMP:<{ // n cs - 8 LDU // n _35 _34 + 16 LDU // n _39 _38 NIP // n cs - 0 PUSHINT // n cs _17=0 - s0 s2 XCHG // _17=0 cs n - LDUX // _17=0 _37 _36 - DROP // _17=0 _18 + 0 PUSHINT // n cs _20=0 + s0 s2 XCHG // _20=0 cs n + LDUX // _20=0 _41 _40 + DROP // _20=0 _21 }> // n cs 2DROP // - -1 PUSHINT // _20=-1 - 0 PUSHINT // _20=-1 _21=0 - }> // query_id n last_cleaned cs - DROP - NIP // query_id last_cleaned - LEQ // _22 - NEGATE // _23 - 0 PUSHINT // _23 _24=0 + -1 PUSHINT // _23=-1 + 0 PUSHINT // _23=-1 _24=0 + }> // query_id last_cleaned n cs + 2DROP // query_id last_cleaned + LEQ // _25 + NEGATE // _26 + 0 PUSHINT // _26 _27=0 }> processed? PROC:<{ // query_id @@ -323,12 +431,12 @@ PROGRAM{ DROP // x }> create_init_state PROC:<{ - // n k public_keys - NEWDICT // n k public_keys _3 - s2 s3 XCHG2 + // wallet_id n k owners_info + NEWDICT // wallet_id n k owners_info _4 + s3 s4 XCHG2 0 PUSHINT - -ROT // _3 public_keys _4=0 k n - pack_state INLINECALLDICT // _5 + 3 -ROLL // _4 owners_info _5=0 k n wallet_id + pack_state INLINECALLDICT // _6 }> merge_list PROC:<{ // a b @@ -351,7 +459,7 @@ PROGRAM{ LDREF // b _10 as s0 s2 XCHG // as _10 b merge_list CALLDICT // as tail - NEWC // as tail _13 + NEWC ROT // tail _13 as STSLICER // tail _14 STREF // _15 @@ -367,9 +475,9 @@ PROGRAM{ }> get_public_keys PROC:<{ // - unpack_state INLINECALLDICT // _6 _7 _8 _9 _10 - s1 s4 XCHG - 4 BLKDROP // public_keys + unpack_state INLINECALLDICT // _7 _8 _9 _10 _11 _12 + s1 s5 XCHG + 5 BLKDROP // public_keys }> check_query_signatures PROC:<{ // query @@ -396,10 +504,9 @@ PROGRAM{ OVER // public_keys mask signatures cs signatures ISNULL // public_keys mask signatures cs _32 IFJMP:<{ // public_keys mask signatures cs - s2 s3 XCHG - 3 BLKDROP // mask - 1 PUSHINT // mask _33=1 - SWAP // _33=1 mask + 2DROP + 1 PUSHINT + s2 POP // _33=1 mask }> // public_keys mask signatures cs HASHSU // public_keys mask signatures _35 ROT // public_keys signatures _35 mask @@ -410,53 +517,50 @@ PROGRAM{ }> messages_by_mask PROC:<{ // mask - unpack_state INLINECALLDICT // mask _29 _30 _31 _32 _33 - s0 s3 XCHG - 3 BLKDROP // mask n pending_queries - -1 PUSHINT // mask n pending_queries i=-1 - NEWDICT // mask n pending_queries i=-1 a + unpack_state INLINECALLDICT // mask _32 _33 _34 _35 _36 _37 + s5 POP + 3 BLKDROP // mask pending_queries n + -1 PUSHINT // mask pending_queries n i=-1 + NEWDICT // mask pending_queries n i=-1 a UNTIL:<{ - s1 s2 XCPU - 64 PUSHINT // mask n pending_queries a i pending_queries _13=64 + s1 s3 XCPU + 64 PUSHINT // mask pending_queries n a i pending_queries _14=64 DICTUGETNEXT - NULLSWAPIFNOT - NULLSWAPIFNOT // mask n pending_queries a cs i f - DUP // mask n pending_queries a cs i f f - IF:<{ // mask n pending_queries a cs i f - s0 s2 XCHG // mask n pending_queries a f i cs - 1 LDI // mask n pending_queries a f i _15 cs - SWAP // mask n pending_queries a f i cs _15 - IF:<{ // mask n pending_queries a f i cs + NULLSWAPIFNOT2 // mask pending_queries n a cs i f + DUP // mask pending_queries n a cs i f f + IF:<{ // mask pending_queries n a cs i f + s0 s2 XCHG // mask pending_queries n a f i cs + 1 LDI // mask pending_queries n a f i _16 cs + SWAP // mask pending_queries n a f i cs _16 + IF:<{ // mask pending_queries n a f i cs DUP - 8 PUSHINT // mask n pending_queries a f i cs cs _19=8 - SDSKIPFIRST // mask n pending_queries a f i cs _20 - s6 PUSH // mask n pending_queries a f i cs _20 n - PLDUX // mask n pending_queries a f i cs cnt_bits - s7 PUSH // mask n pending_queries a f i cs cnt_bits mask - AND // mask n pending_queries a f i cs _22 - IF:<{ // mask n pending_queries a f i cs - NEWC // mask n pending_queries a f i cs _24 - SWAP // mask n pending_queries a f i _24 cs - STSLICER // mask n pending_queries a f i _25 - SWAP - 64 PUSHINT - s1 s4 s4 PUXC2 // mask n pending_queries i f _25 i a _26=64 - DICTUSETB // mask n pending_queries i f a + 16 PUSHINT // mask pending_queries n a f i cs cs _22 + SDSKIPFIRST // mask pending_queries n a f i cs _23 + s5 PUSH // mask pending_queries n a f i cs _23 n + PLDUX // mask pending_queries n a f i cs cnt_bits + s7 PUSH // mask pending_queries n a f i cs cnt_bits mask + AND // mask pending_queries n a f i cs _25 + IF:<{ // mask pending_queries n a f i cs + NEWC // mask pending_queries n a f i cs _27 + SWAP // mask pending_queries n a f i _27 cs + STSLICER // mask pending_queries n a f i _28 + s0 s0 s3 XCPUXC + 64 PUSHINT // mask pending_queries n i f _28 i a _29=64 + DICTUSETB // mask pending_queries n i f a + s0 s2 XCHG // mask pending_queries n a f i }>ELSE<{ - s1 s3 XCHG - DROP // mask n pending_queries i f a + DROP // mask pending_queries n a f i }> }>ELSE<{ - s1 s3 XCHG - DROP // mask n pending_queries i f a + DROP // mask pending_queries n a f i }> }>ELSE<{ - 2SWAP - DROP // mask n pending_queries i f a + s2 POP // mask pending_queries n a f i }> - SWAP // mask n pending_queries i a f - NOT // mask n pending_queries i a _28 - }> // mask n pending_queries i a + SWAP // mask pending_queries n a i f + NOT // mask pending_queries n a i _31 + s1 s2 XCHG // mask pending_queries n i a _31 + }> // mask pending_queries n i a s0 s4 XCHG 4 BLKDROP // a }> @@ -473,8 +577,9 @@ PROGRAM{ }> get_n_k PROC:<{ // - unpack_state INLINECALLDICT // _6 _7 _8 _9 _10 - 3 BLKDROP // n k + unpack_state INLINECALLDICT // _7 _8 _9 _10 _11 _12 + 3 BLKDROP + 1 2 BLKDROP2 // n k }> merge_inner_queries PROC:<{ // a b diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp index 1391da27b8..327046a2b6 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.cpp @@ -1 +1 @@ -with_tvm_code("restricted-wallet", "te6ccgECDQEAAQgAART/APSkE/Sg8sgLAQIBIAIDAgFIBAUB+vKDCNcYINMf0x/4IxK78mPtRNDTH9P/0VMxuvKhA54xMjL4AKTIyx/L/8ntVOED+QFUEEL5EPKi+ACA8/gzIG6SMH+X0NcLH/gjvOJx+DPQ1wv/BJMg10qOldMH1H8kjoUwUxbbPN6TAvsAkjIw4ugxMwLRpMjLH8v/ye1UDAICzgYHAgEgCgsCASAICQEBSAwAAwwgACUgPP4MyBukjB/l9DXCx/4I7zigABG+ZL9qJoa4WPwAOby2BAefwZkDdJGD/L6GuFj/wR3nFIuEp8EzeIcUADIB0NMDAXiwklt/4PpAMfpAMPpEAcD/Arqw"); +with_tvm_code("restricted-wallet", "te6ccgEBDAEA+wABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQL28oMI1xgg0x/TH/gjErvyY+1E0NMf0//RUzG68qEDnjFsIvgApMjLH8v/ye1U4QP5AVQQQvkQ8qL4AIDz+DMgbpIwf5fQ1wsf+CO84nH4M9DXC/8EkyDXSo6V0wfUfySOhTBTFts83pMC+wCSbCHi6DEzAtGkyMsfy//JCgsABNAwAgEgBgcCASAICQA5vLYEB5/BmQN0kYP8voa4WP/BHecUi4SnwTt4hxQAF7s5ztRNDTHzHXC/+AARuMl+1E0NcLH4ADIB0NMDAXiwklt/4PpAMfpAMPpEAcD/ArqwAATtVA=="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif index 6582706c2b..3381cf16b0 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet-code.fif @@ -5,6 +5,7 @@ PROGRAM{ DECLPROC check_destination DECLPROC recv_external 85143 DECLMETHOD seqno + 78748 DECLMETHOD get_public_key 104128 DECLMETHOD balance recv_internal PROC:<{ // in_msg @@ -71,8 +72,7 @@ PROGRAM{ s0 s3 XCHG // signature in_msg public_key cs stored_seqno msg_seqno IFNOTJMP:<{ // signature in_msg public_key cs stored_seqno NIP - s2 POP - s2 POP // public_key stored_seqno + 2 2 BLKDROP2 // public_key stored_seqno ACCEPT INC // public_key _35 NEWC // public_key _35 _36 @@ -110,8 +110,7 @@ PROGRAM{ s0 s2 XCHG // elector stored_seqno public_key restrict cs msg mode SENDRAWMSG }>ELSE<{ - s2 POP - DROP // elector stored_seqno public_key restrict cs + 2 1 BLKDROP2 // elector stored_seqno public_key restrict cs }> }> // elector stored_seqno public_key restrict cs NIP @@ -131,6 +130,14 @@ PROGRAM{ CTOS // _1 32 PLDU // _3 }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 32 LDU // _9 _8 + NIP // cs + 256 PLDU // _7 + }> balance PROC:<{ // restricted? INLINECALLDICT // _0 diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp index a95ad749d2..dea7e2c94d 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.cpp @@ -1 +1 @@ -with_tvm_code("restricted-wallet2", "te6ccgECDAEAAR0AART/APSkE/Sg8sgLAQIBIAIDAgFIBAUBAvIKAgLPBgcCASAICQADDCAAMyA8/gzIG6SMH+e+CMB0NcLH6GCAVGAqQTigABG+ZL9qJoa4WPwAf7y2B2omhAgJBrkPoCaMB5/BmQN0kYP898EYDoa4WP0MEAqMBUgnF8EzeIAUAIej230LfQmMv9ABhQuFsEyJhxQB/oMI1xgg0x/TH/gjErvyY+1E0NMf0//0BNFTQrryoQSOEjIzM/gAAaTIyx8Sy//0AMntVOEE+QFUEFT5EPKi+ACA8/gzIG6SMH+e+CMB0NcLH6GCAVGAqQTiIoAQ9HtvoW+hMZb6ADBy+wKRMOKTINdKltMH1AL7AOjRAqTIyx8LAA7L//QAye1U"); +with_tvm_code("restricted-wallet2", "te6ccgECCwEAAQgAART/APSkE/S88sgLAQIBIAIDAgFIBAUB+PKDCNcYINMf0x/4IxK78mPtRNDTH9P/9ATRU0K68qEEjhIyMzP4AAGkyMsfEsv/9ADJ7VThBPkBVBBU+RDyovgAgPP4MyBukjB/nvgjAdDXCx+hggFRgKkE4iKAEPR7b6UxlvoAMHL7ApEw4pMg10qW0wfUAvsA6NECpMgKAATQMAIBIAYHAgEgCAkAe7y2B2omhAgJBrkPoCaMB5/BmQN0kYP898EYDoa4WP0MEAqMBUgnF8E7eIAUAIej230pjL/QAYULhbBMiYcUABe7Oc7UTQ0x8x1wv/gAEbjJftRNDXCx+AASyx/L//QAye1U"); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif index 112e8c6228..18ffda9b63 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/restricted-wallet2-code.fif @@ -4,6 +4,7 @@ PROGRAM{ DECLPROC days_passed DECLPROC recv_external 85143 DECLMETHOD seqno + 78748 DECLMETHOD get_public_key 104128 DECLMETHOD balance recv_internal PROC:<{ // in_msg @@ -74,8 +75,7 @@ PROGRAM{ s2 PUSH 16 PUSHINT // stored_seqno public_key rdict cs ts rdict _57=16 DICTIGETPREVEQ - NULLSWAPIFNOT - NULLSWAPIFNOT // stored_seqno public_key rdict cs _98 _97 _99 + NULLSWAPIFNOT2 // stored_seqno public_key rdict cs _98 _97 _99 NIP // stored_seqno public_key rdict cs value found IF:<{ // stored_seqno public_key rdict cs value LDGRAMS // stored_seqno public_key rdict cs _101 _100 @@ -110,6 +110,14 @@ PROGRAM{ CTOS // _1 32 PLDU // _3 }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 32 LDU // _9 _8 + NIP // cs + 256 PLDU // _7 + }> balance PROC:<{ // c4 PUSH // _1 @@ -124,8 +132,7 @@ PROGRAM{ s0 s2 XCHG 16 PUSHINT // balance ts rdict _19=16 DICTIGETPREVEQ - NULLSWAPIFNOT - NULLSWAPIFNOT // balance _29 _28 _30 + NULLSWAPIFNOT2 // balance _29 _28 _30 NIP // balance value found IF:<{ // balance value LDGRAMS // balance _32 _31 diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp index ea4603f0ae..1bffadf5b5 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-code.cpp @@ -1 +1 @@ -with_tvm_code("simple-wallet", "te6ccgEBBAEATwABFP8A9KQT9KDyyAsBAgEgAgMABNIwAG7ygwjXGCDTH+1E0NMf0//RUTG68qED+QFUEEL5EPKi+ABRINdKltMH1AL7AN7RpMjLH8v/ye1U"); +with_tvm_code("simple-wallet", "te6ccgEBBAEATwABFP8A9KQT9LzyyAsBAgEgAgMABNIwAG7ygwjXGCDTH+1E0NMf0//RUTG68qED+QFUEEL5EPKi+ABRINdKltMH1AL7AN7RpMjLH8v/ye1U"); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp index ad546b2894..3370e53e39 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.cpp @@ -1 +1 @@ -with_tvm_code("simple-wallet-ext", "te6ccgEBFgEAzwABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQA08vACVDIS8AT4ACDXSpbTB9QC+wDe0aQB8AMCAs0GBwIBIA4PAgEgCAkAKdAUGEa4wQaY+CXXlQ/ICgCfyIeVFAIBIAoLAgEgDA0AAwwgAA8yBLLH8v/yYAARO1E0NMf0/8wgAAk8AHtVIAIBIBARAgEgFBUADbvtlwAfABgCASASEwARtZL9qJoa4WPwAA22l54AXgCQACG40BggFMl+1D2IIByODtQ9iAAVuI4MjLHxLLB8zJg="); +with_tvm_code("simple-wallet-ext", "te6ccgEBGAEA3AABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQA08vACVDIS8AT4ACDXSpbTB9QC+wDe0aQB8AMCAs0GBwIBIA4PAgEgCAkAKdAUGEa4wQaY+CXXlQ/ICgCfyIeVFAIBIAoLAgEgDA0AAwwgAA8AcjLH8v/yYAARO1E0NMf0/8wgAAk8AHtVIAIBIBARAgEgFhcCAW4SEwIBIBQVAAutzngBGMAADa9suAD4AMAAEbWS/aiaGuFj8AANtpeeAF4AkAAhuNAYIBTJftQ9iCAcjg7UPYgAFbiODIyx8SywfMyY"); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif index b403131e07..b7975e9480 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/simple-wallet-ext-code.fif @@ -7,14 +7,15 @@ PROGRAM{ DECLPROC do_verify_message DECLPROC recv_external 85143 DECLMETHOD seqno + 78748 DECLMETHOD get_public_key 81625 DECLMETHOD create_init_state 116960 DECLMETHOD prepare_send_message_with_seqno 101633 DECLMETHOD prepare_send_message 95420 DECLMETHOD verify_message create_state PROC:<{ // seqno public_key - NEWC // seqno public_key _2 - s1 s2 XCHG // public_key seqno _2 + SWAP + NEWC // public_key seqno _2 32 STU // public_key _4 256 STU // _6 ENDC // _7 @@ -76,6 +77,11 @@ PROGRAM{ CTOS // _1 32 PLDU // _3 }> + get_public_key PROC:<{ + // + load_state CALLDICT // _3 _4 + NIP // public_key + }> create_init_state PROC:<{ // public_key 0 PUSHINT // public_key _1=0 diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp index 52fefeeb07..b706359e4f 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.cpp @@ -1 +1 @@ -with_tvm_code("wallet", "te6ccgEBBgEAaAABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQCA8oMI1xgg0x/TH/gjErvyY+1E0NMf0//RUTG68qED+QFUEEL5EPKi+AACkyDXSpbTB9QC+wDo0aTIyx/L/8ntVAAE0DAAEaCZL9qJoa4WPw=="); +with_tvm_code("wallet", "te6ccgEBCAEAewABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQCA8oMI1xgg0x/TH/gjErvyY+1E0NMf0//RUTG68qED+QFUEEL5EPKi+AACkyDXSpbTB9QC+wDo0aTIyx/L/8ntVAAE0DACAUgGBwAXuznO1E0NMfMdcL/4ABG4yX7UTQ1wsfg="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif index cd9fa5d0f8..4aa0cc0877 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet-code.fif @@ -3,6 +3,7 @@ PROGRAM{ DECLPROC recv_internal DECLPROC recv_external 85143 DECLMETHOD seqno + 78748 DECLMETHOD get_public_key recv_internal PROC:<{ // in_msg DROP // @@ -56,4 +57,12 @@ PROGRAM{ CTOS // _1 32 PLDU // _3 }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 32 LDU // _9 _8 + NIP // cs + 256 PLDU // _7 + }> }END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp index 90e47b54d1..e5f46f8820 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.cpp @@ -1 +1 @@ -with_tvm_code("wallet3", "te6ccgEBBgEAcwABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQCW8oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj+ACTINdKltMH1AL7AOgwAaTIyx/LH8v/ye1UAATQMAARoJkv2omhrhY/"); +with_tvm_code("wallet3", "te6ccgEBCAEAhgABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQCW8oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/0VEyuvKhUUS68qIE+QFUEFX5EPKj+ACTINdKltMH1AL7AOgwAaTIyx/LH8v/ye1UAATQMAIBSAYHABe7Oc7UTQ0z8x1wv/gAEbjJftRNDXCx+A=="); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif index b0b45d7516..d539f3bad8 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/auto/wallet3-code.fif @@ -3,6 +3,7 @@ PROGRAM{ DECLPROC recv_internal DECLPROC recv_external 85143 DECLMETHOD seqno + 78748 DECLMETHOD get_public_key recv_internal PROC:<{ // in_msg DROP // @@ -62,4 +63,12 @@ PROGRAM{ CTOS // _1 32 PLDU // _3 }> + get_public_key PROC:<{ + // + c4 PUSH // _1 + CTOS // cs + 64 LDU // _9 _8 + NIP // cs + 256 PLDU // _7 + }> }END>c diff --git a/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc index 3a897d4cd0..15c87b3833 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/config-code.fc @@ -9,10 +9,9 @@ (cell, int, int, cell) load_data() inline { var cs = get_data().begin_parse(); - var (cfg_dict, stored_seqno, public_key) = (cs~load_ref(), cs~load_uint(32), cs~load_uint(256)); - var vote_dict = cs.slice_empty?() ? new_dict() : cs~load_dict(); + var res = (cs~load_ref(), cs~load_uint(32), cs~load_uint(256), cs~load_dict()); cs.end_parse(); - return (cfg_dict, stored_seqno, public_key, vote_dict); + return res; } () store_data(cfg_dict, stored_seqno, public_key, vote_dict) impure inline { @@ -26,7 +25,7 @@ (int, int) check_validator_set(cell vset) { var cs = vset.begin_parse(); - throw_if(9, (cs~load_uint(8) - 0x11) & -2); ;; validators#11 or validators_ext#12 + throw_unless(9, cs~load_uint(8) == 0x12); ;; validators_ext#12 only int utime_since = cs~load_uint(32); int utime_until = cs~load_uint(32); int total = cs~load_uint(16); @@ -103,7 +102,7 @@ .end_cell(), 0); } -() after_code_upgrade(slice param, cell old_code) impure method_id(1666) { +() after_code_upgrade(slice param, cont old_code) impure method_id(1666) { } _ perform_action(cfg_dict, public_key, action, cs) { @@ -119,7 +118,7 @@ _ perform_action(cfg_dict, public_key, action, cs) { var new_code = cs~load_ref(); set_code(new_code); var old_code = get_c3(); - set_c3(new_code); + set_c3(new_code.begin_parse().bless()); after_code_upgrade(cs, old_code); throw(0); return (cfg_dict, public_key); @@ -138,16 +137,21 @@ _ perform_action(cfg_dict, public_key, action, cs) { } } -slice get_validator_descr(int idx) inline_ref { +(slice, int) get_validator_descr(int idx) inline_ref { var vset = config_param(34); if (vset.null?()) { - return null(); + return (null(), 0); } var cs = begin_parse(vset); - cs~skip_bits(8 + 32 + 32 + 16 + 16); + ;; validators_ext#12 utime_since:uint32 utime_until:uint32 + ;; total:(## 16) main:(## 16) { main <= total } { main >= 1 } + ;; total_weight:uint64 + throw_unless(40, cs~load_uint(8) == 0x12); + cs~skip_bits(32 + 32 + 16 + 16); + int total_weight = cs~load_uint(64); var dict = begin_cell().store_slice(cs).end_cell(); var (value, _) = dict.udict_get?(16, idx); - return value; + return (value, total_weight); } (int, int) unpack_validator_descr(slice cs) inline { @@ -159,33 +163,51 @@ slice get_validator_descr(int idx) inline_ref { return (cs~load_uint(256), cs~load_uint(64)); } -slice create_new_entry(cs) inline { - return begin_cell().store_int(false, 1).store_uint(0, 64).store_uint(0, 256).store_slice(cs).end_cell().begin_parse(); +(cell, int, int, slice) new_proposal(cs) inline { + return (null(), 0, 0, cs); } -(cell, int, int, slice) unpack_suggestion(slice cs) inline { +(cell, int, int, slice) unpack_proposal(slice cs) inline { return (cs~load_dict(), cs~load_uint(64), cs~load_uint(256), cs); } -builder pack_suggestion(cell voters, int sum_weight, int vset_id, slice body) inline { +builder pack_proposal(cell voters, int sum_weight, int vset_id, slice body) inline { return begin_cell().store_dict(voters).store_uint(sum_weight, 64).store_uint(vset_id, 256).store_slice(body); } -cell register_vote(vote_dict, action, cs, idx, weight) { +(cell, slice) register_vote(vote_dict, action, cs, idx, weight, total_weight, cur_vset_id) { int hash = 0; + int found? = 0; var entry = null(); if (action & 1) { hash = slice_hash(cs); - (entry, var found?) = vote_dict.udict_get?(256, hash); - ifnot (found?) { - entry = create_new_entry(cs); - } + (entry, found?) = vote_dict.udict_get?(256, hash); } else { hash = cs.preload_uint(256); - (entry, var found?) = vote_dict.udict_get?(256, hash); + (entry, found?) = vote_dict.udict_get?(256, hash); throw_unless(42, found?); } - return vote_dict; + var (voters, sum_weight, vset_id, body) = found? ? unpack_proposal(entry) : (null(), 0, cur_vset_id, cs); + if (vset_id != cur_vset_id) { + voters = null(); + sum_weight = 0; + vset_id = cur_vset_id; + } + var (_, found?) = voters.udict_get?(16, idx); + ifnot (found?) { + voters~udict_set_builder(16, idx, begin_cell().store_uint(32, now())); + sum_weight += weight; + if (sum_weight * 3 > total_weight * 2) { + ;; proposal accepted + vote_dict~udict_delete?(256, hash); + return (vote_dict, body); + } else { + vote_dict~udict_set_builder(256, hash, pack_proposal(voters, sum_weight, cur_vset_id, body)); + return (vote_dict, null()); + } + } else { + return (vote_dict, null()); + } } () recv_external(slice in_msg) impure { @@ -199,15 +221,19 @@ cell register_vote(vote_dict, action, cs, idx, weight) { throw_unless(33, msg_seqno == stored_seqno); ifnot ((action - 0x566f7465) & -2) { var idx = cs~load_uint(16); - var vdescr = get_validator_descr(idx); + var (vdescr, total_weight) = get_validator_descr(idx); var (val_pubkey, weight) = unpack_validator_descr(vdescr); throw_unless(34, check_signature(slice_hash(in_msg), signature, val_pubkey)); accept_message(); stored_seqno += 1; store_data(cfg_dict, stored_seqno, public_key, vote_dict); commit(); - vote_dict = register_vote(vote_dict, action, cs, idx, weight); + (vote_dict, var accepted) = register_vote(vote_dict, action, cs, idx, weight, total_weight, config_param(34).cell_hash()); store_data(cfg_dict, stored_seqno, public_key, vote_dict); + ifnot (accepted.null?()) { + (cfg_dict, public_key) = perform_action(cfg_dict, public_key, accepted~load_uint(32), accepted); + store_data(cfg_dict, stored_seqno, public_key, vote_dict); + } return (); } throw_unless(34, check_signature(slice_hash(in_msg), signature, public_key)); @@ -231,7 +257,7 @@ cell register_vote(vote_dict, action, cs, idx, weight) { if (ds.slice_bits() >= 40) { var tag = ds~load_uint(8); var since = ds.preload_uint(32); - if ((tag == 0x11) & (since >= now())) { + if ((since <= now()) & (tag == 0x12)) { ;; next validator set becomes active! var cur_vset = cfg_dict~idict_set_get_ref(kl, 34, next_vset); ;; next_vset -> cur_vset cfg_dict~idict_set_get_ref(kl, 32, cur_vset); ;; cur_vset -> prev_vset @@ -241,3 +267,7 @@ cell register_vote(vote_dict, action, cs, idx, weight) { } set_data(begin_cell().store_ref(cfg_dict).store_slice(cs).end_cell()); } + +int seqno() impure method_id { + return get_data().begin_parse().preload_uint(32); +} diff --git a/submodules/ton/tonlib-src/crypto/smartcont/dns-auto-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/dns-auto-code.fc new file mode 100644 index 0000000000..e548a70a07 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/dns-auto-code.fc @@ -0,0 +1,514 @@ +{- + Adapted from original version written by: + /------------------------------------------------------------------------\ + | Created for: Telegram (Open Network) Blockchain Contest | + | Task 2: DNS Resolver (Automatically registering) | + >------------------------------------------------------------------------< + | Author: Oleksandr Murzin (tg: @skydev / em: alexhacker64@gmail.com) | + | October 2019 | + \------------------------------------------------------------------------/ +-} + +;;===========================================================================;; +;; Utility functions ;; +;;===========================================================================;; + +{- + Data structure: + Root cell: [OptRef<1b+1r?>:HashmapUInt<32b>,CatTable>:domains] + [OptRef<1b+1r?>:Hashmap(Time|Hash128)->Slice(DomName)>:gc] + [UInt<32b>:stdperiod] [Gram:PPReg] [Gram:PPCell] [Gram:PPBit] + [UInt<32b>:lasthousekeeping] + := HashmapE 16 ^DNSRecord + + STORED DOMAIN NAME SLICE FORMAT: (#ZeroChars<7b>) (Domain name value) + #Zeros allows to simultaneously store, for example, com\0 and com\0google\0 + That will be stored as \1com\0 and \2com\0google\0 (pfx tree has restricitons) + This will allow to resolve more specific requests to subdomains, and resort + to parent domain next resolver lookup if subdomain is not found + com\0goo\0 lookup will, for example look up \2com\0goo\0 and then + \1com\0goo\0 which will return \1com\0 (as per pfx tree) with -1 cat +-} + +(cell, cell, cell, [int, int, int, int], int, int) load_data() inline_ref { + slice cs = get_data().begin_parse(); + return ( + cs~load_ref(), ;; control data + cs~load_dict(), ;; pfx tree: domains data and exp + cs~load_dict(), ;; gc auxillary with expiration and 128-bit hash slice + [ cs~load_uint(30), ;; length of this period of time in seconds + cs~load_grams(), ;; standard payment for registering a new subdomain + cs~load_grams(), ;; price paid for each cell (PPC) + cs~load_grams() ], ;; and bit (PPB) + cs~load_uint(32), ;; next housekeeping to be done at + cs~load_uint(32) ;; last housekeeping done at + ); +} + +(int, int, int, int) load_prices() inline_ref { + slice cs = get_data().begin_parse(); + (cs~load_ref(), cs~load_dict(), cs~load_dict()); + return (cs~load_uint(30), cs~load_grams(), cs~load_grams(), cs~load_grams()); +} + +() store_data(cell ctl, cell dd, cell gc, prices, int nhk, int lhk) impure { + var [sp, ppr, ppc, ppb] = prices; + set_data(begin_cell() + .store_ref(ctl) ;; control data + .store_dict(dd) ;; domains data and exp + .store_dict(gc) ;; keyed expiration time and 128-bit hash slice + .store_uint(sp, 30) ;; standard period + .store_grams(ppr) ;; price per registration + .store_grams(ppc) ;; price per cell + .store_grams(ppb) ;; price per bit + .store_uint(nhk, 32) ;; next housekeeping + .store_uint(lhk, 32) ;; last housekeeping + .end_cell()); +} + +global var query_info; + +() send_message(slice addr, int tag, int query_id, + int body, int grams, int mode) impure { + ;; int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool + ;; src:MsgAddress -> 011000 0x18 + var msg = begin_cell() + .store_uint (0x18, 6) + .store_slice(addr) + .store_grams(grams) + .store_uint (0, 1 + 4 + 4 + 64 + 32 + 1 + 1) + .store_uint (tag, 32) + .store_uint (query_id, 64); + if (body >= 0) { + msg~store_uint(body, 32); + } + send_raw_message(msg.end_cell(), mode); +} + +() send_error(int error_code) impure { + var (addr, query_id, op) = query_info; + return send_message(addr, error_code, query_id, op, 0, 64); +} + +() send_ok(int price) impure { + raw_reserve(price, 4); + var (addr, query_id, op) = query_info; + return send_message(addr, 0xef6b6179, query_id, op, 0, 128); +} + +() housekeeping(cell ctl, cell dd, cell gc, prices, int nhk, int lhk, int max_steps) impure { + int n = now(); + if (n < max(nhk, lhk + 60)) { ;; housekeeping cooldown: 1 minute + ;; if housekeeping was done recently, or if next housekeeping is in the future, just save + return store_data(ctl, dd, gc, prices, nhk, lhk); + } + ;; need to do some housekeeping - maybe remove entry with + ;; least expiration but only if it is already expired + ;; no iterating and deleting all to not put too much gas gc + ;; burden on any random specific user request + ;; over time it will do the garbage collection required + (int mkey, _, int found?) = gc.udict_get_min?(256); + while (found? & max_steps) { ;; no short circuit optimization, two nested ifs + nhk = (mkey >> (256 - 32)); + if (nhk < n) { + int key = mkey % (1 << (256 - 32)); + (slice val, found?) = dd.udict_get?(256 - 32, key); + if (found?) { + int exp = val.preload_uint(32); + if (exp <= n) { + dd~udict_delete?(256 - 32, key); + } + } + gc~udict_delete?(256, mkey); + (mkey, _, found?) = gc.udict_get_min?(256); + nhk = (found? ? mkey >> (256 - 32) : 0xffffffff); + max_steps -= 1; + } else { + found? = false; + } + } + store_data(ctl, dd, gc, prices, nhk, n); +} + +int calcprice_internal(slice domain, cell data, ppc, ppb) inline_ref { ;; only for internal calcs + var (_, bits, refs) = compute_data_size(data, 100); ;; 100 cells max + bits += slice_bits(domain) * 2 + (128 + 32 + 32); + return ppc * (refs + 2) + ppb * bits; +} + +int check_owner(cell cat_table, cell owner_info, int src_wc, int src_addr, int strict) inline_ref { + if (strict & cat_table.null?()) { ;; domain not found: return notf | 2^31 + return 0xee6f7466; + } + if (owner_info.null?()) { ;; no owner on this domain: no-2 (in strict mode), ok else + return strict & 0xee6f2d32; + } + var ERR_BAD2 = 0xe2616432; + slice sown = owner_info.begin_parse(); + if (sown.slice_bits() < 16 + 3 + 8 + 256) { ;; bad owner record: bad2 + return ERR_BAD2; + } + if (sown~load_uint(16 + 3) != 0x9fd3 * 8 + 4) { + return ERR_BAD2; + } + (int owner_wc, int owner_addr) = (sown~load_int(8), sown.preload_uint(256)); + if ((owner_wc != src_wc) | (owner_addr != src_addr)) { ;; not owner: nown + return 0xee6f776e; + } + return 0; ;; ok +} + +;;===========================================================================;; +;; Internal message handler (Code 0) ;; +;;===========================================================================;; + +{- + Internal message cell structure: + 8 4 2 1 + int_msg_info$0 ihr_disabled:Bool bounce:Bool bounced:Bool + src:MsgAddressInt dest:MsgAddressInt + value:CurrencyCollection ihr_fee:Grams fwd_fee:Grams + created_lt:uint64 created_at:uint32 + Internal message data structure: + [UInt<32b>:op] [UInt<64b>:query_id] [Ref<1r>:domain] + (if not prolong: [Ref<1r>:value->CatTable]) + +-} + +;; Control operations: permitted only to the owner of this smartcontract +() perform_ctl_op(int op, int src_wc, int src_addr, slice in_msg) impure inline_ref { + var (ctl, domdata, gc, prices, nhk, lhk) = load_data(); + var cs = ctl.begin_parse(); + if ((cs~load_int(8) != src_wc) | (cs~load_uint(256) != src_addr)) { + return send_error(0xee6f776e); + } + if (op == 0x43685072) { ;; ChPr = Change Prices + var (stdper, ppr, ppc, ppb) = (in_msg~load_uint(32), in_msg~load_grams(), in_msg~load_grams(), in_msg~load_grams()); + in_msg.end_parse(); + ;; NB: stdper == 0 -> disable new actions + store_data(ctl, domdata, gc, [stdper, ppr, ppc, ppb], nhk, lhk); + return send_ok(0); + } + if (op == 0x4344656c) { ;; CDel = destroy smart contract + ifnot (domdata.null?()) { + ;; domain dictionary not empty, force gc + housekeeping(ctl, domdata, gc, prices, nhk, 1, -1); + } + (ctl, domdata, gc, prices, nhk, lhk) = load_data(); + ifnot (domdata.null?()) { + ;; domain dictionary still not empty, error + return send_error(0xee74656d); + } + var (addr, query_id, op) = query_info; + return send_message(addr, 0xef6b6179, query_id, op, 0, 128 + 32); + } + return send_error(0xffffffff); +} + +;; Must send at least GR$1 more for possible gas fees! +() recv_internal(int msg_value, cell in_msg_cell, slice in_msg) impure { + ;; this time very interested in internal messages + if (in_msg.slice_bits() < 32) { + return (); ;; simple transfer or short + } + slice cs = in_msg_cell.begin_parse(); + int flags = cs~load_uint(4); + if (flags & 1) { + return (); ;; bounced messages + } + slice s_addr = cs~load_msg_addr(); + (int src_wc, int src_addr) = s_addr.parse_std_addr(); + int op = in_msg~load_uint(32); + ifnot (op) { + return (); ;; simple transfer with comment + } + int query_id = 0; + if (in_msg.slice_bits() >= 64) { + query_id = in_msg~load_uint(64); + } + + query_info = (s_addr, query_id, op); + + if (op & (1 << 31)) { + return (); ;; an answer to our query + } + if ((op >> 24) == 0x43) { + ;; Control operations + return perform_ctl_op(op, src_wc, src_addr, in_msg); + } + + int qt = (op == 0x72656764) * 1 + (op == 0x70726f6c) * 2 + (op == 0x75706464) * 4 + (op == 0x676f6763) * 8; + ifnot (qt) { ;; unknown query, return error + return send_error(0xffffffff); + } + qt = - qt; + + (cell ctl, cell domdata, cell gc, [int, int, int, int] prices, int nhk, int lhk) = load_data(); + + if (qt == 8) { ;; 0x676f6763 -> GO, GC! go!!! + ;; Manual garbage collection iteration + int max_steps = in_msg~load_int(32); ;; -1 = infty + housekeeping(ctl, domdata, gc, prices, nhk, 1, max_steps); ;; forced + return send_error(0xef6b6179); + } + + slice domain = null(); + cell domain_cell = in_msg~load_maybe_ref(); + int fail = 0; + if (domain_cell.null?()) { + int bytes = in_msg~load_uint(6); + fail = (bytes == 0); + domain = in_msg~load_bits(bytes * 8); + } else { + domain = domain_cell.begin_parse(); + var (bits, refs) = slice_bits_refs(domain); + fail = (refs | ((bits - 8) & (7 - 128))); + } + + ifnot (fail) { + ;; domain must end with \0! no\0 error + fail = domain.slice_last(8).preload_uint(8); + } + if (fail) { + return send_error(0xee6f5c30); + } + + int n = now(); + cell cat_table = cell owner_info = null(); + int key = int exp = int zeros = 0; + slice tail = domain; + repeat (tail.slice_bits() ^>> 3) { + cat_table = null(); + int z = (tail~load_uint(8) == 0); + zeros -= z; + if (z) { + key = (string_hash(domain.skip_last_bits(tail.slice_bits())) >> 32); + var (val, found?) = domdata.udict_get?(256 - 32, key); + if (found?) { + exp = val~load_uint(32); + if (exp >= n) { ;; entry not expired + cell cat_table = val~load_ref(); + val.end_parse(); + var (cown, ok) = cat_table.idict_get_ref?(16, -2); + if (ok) { + owner_info = cown; + } + } + } + } + } + + if (zeros > 4) { ;; too much zero chars (overflow): ov\0 + return send_error(0xef765c30); + } + + ;; ########################################################################## + + int err = check_owner(cat_table, owner_info, src_wc, src_addr, qt != 1); + if (err) { + return send_error(err); + } + + ;; ########################################################################## + + ;; load desired data (reuse old for a "prolong" operation) + cell data = null(); + + if (qt != 2) { ;; not a "prolong", load data dictionary + data = in_msg~load_ref(); + ;; basic integrity check of (client-provided) dictionary + ifnot (data.dict_empty?()) { ;; 1000 gas! + var (oinfo, ok) = data.idict_get_ref?(16, -2); + if (ok) { + var cs = oinfo.begin_parse(); + throw_unless(31, cs.slice_bits() >= 16 + 3 + 8 + 256); + throw_unless(31, cs.preload_uint(19) == 0x9fd3 * 8 + 4); + } + (_, _, int minok) = data.idict_get_min?(16); + (_, _, int maxok) = data.idict_get_max?(16); + throw_unless(31, minok & maxok); + } + } else { + data = cat_table; + } + + ;; load prices + var [stdper, ppr, ppc, ppb] = prices; + ifnot (stdper) { ;; smart contract disabled by owner, no new actions + return send_error(0xd34f4646); + } + + ;; compute action price + int price = calcprice_internal(domain, data, ppc, ppb) + (ppr & (qt != 4)); + if (msg_value - (1 << 30) < price) { ;; gr prol | prolong domain + if (exp > n + stdper) { ;; does not expire soon, cannot prolong + return send_error(0xf365726f); + } + domdata~udict_set_builder(256 - 32, key, begin_cell().store_uint(exp + stdper, 32).store_ref(data)); + + int gckeyO = (exp << (256 - 32)) + key; + int gckeyN = gckeyO + (stdper << (256 - 32)); + gc~udict_delete?(256, gckeyO); ;; delete old gc entry, add new + gc~udict_set_builder(256, gckeyN, begin_cell()); + + housekeeping(ctl, domdata, gc, prices, nhk, lhk, 1); + return send_ok(price); + } + + ;; ########################################################################## + if (qt == 1) { ;; 0x72656764 -> regd | register domain + ifnot (cat_table.null?()) { ;; domain already exists: return alre | 2^31 + return send_error(0xe16c7265); + } + int expires_at = n + stdper; + domdata~udict_set_builder(256 - 32, key, begin_cell().store_uint(expires_at, 32).store_ref(data)); + + int gckey = (expires_at << (256 - 32)) | key; + gc~udict_set_builder(256, gckey, begin_cell()); + + housekeeping(ctl, domdata, gc, prices, min(nhk, expires_at), lhk, 1); + return send_ok(price); + } + + ;; ########################################################################## + if (qt == 4) { ;; 0x75706464 -> updd | update domain (data) + domdata~udict_set_builder(256 - 32, key, begin_cell().store_uint(exp, 32).store_ref(data)); + housekeeping(ctl, domdata, gc, prices, nhk, lhk, 1); + return send_ok(price); + } + ;; ########################################################################## + + return (); ;; should NEVER reach this part of code! +} + +;;===========================================================================;; +;; External message handler (Code -1) ;; +;;===========================================================================;; + +() recv_external(slice in_msg) impure { + ;; only for initialization + (cell ctl, cell dd, cell gc, var prices, int nhk, int lhk) = load_data(); + ifnot (lhk) { + accept_message(); + return store_data(ctl, dd, gc, prices, 0xffffffff, now()); + } +} + +;;===========================================================================;; +;; Getter methods ;; +;;===========================================================================;; + +(int, cell, int, slice) dnsdictlookup(slice domain, int nowtime) inline_ref { + (int bits, int refs) = domain.slice_bits_refs(); + throw_if(30, refs | (bits & 7)); ;; malformed input (~ 8n-bit) + ifnot (bits) { + return (0, null(), 0, null()); ;; zero-length input + } + + int domain_last_byte = domain.slice_last(8).preload_uint(8); + if (domain_last_byte) { + domain = begin_cell().store_slice(domain) ;; append zero byte + .store_uint(0, 8).end_cell().begin_parse(); + bits += 8; + } + if (bits == 8) { + return (0, null(), 0, null()); ;; zero-length input, but with zero byte + } + var ds = get_data().begin_parse(); + (_, cell root) = (ds~load_ref(), ds~load_dict()); + + slice val = null(); + int tail_bits = -1; + slice tail = domain; + + repeat (bits >> 3) { + if (tail~load_uint(8) == 0) { + var key = (string_hash(domain.skip_last_bits(tail.slice_bits())) >> 32); + var (v, found?) = root.udict_get?(256 - 32, key); + if (found?) { + if (v.preload_uint(32) >= nowtime) { ;; entry not expired + val = v; + tail_bits = tail.slice_bits(); + } + } + } + } + + if (val.null?()) { + return (0, null(), 0, null()); ;; failed to find entry in subdomain dictionary + } + + return (val~load_uint(32), val~load_ref(), tail_bits == 0, domain.skip_last_bits(tail_bits)); +} + +;;8m dns-record-value +(int, cell) dnsresolve(slice domain, int category) method_id { + (int exp, cell cat_table, int exact?, slice pfx) = dnsdictlookup(domain, now()); + ifnot (exp) { + return (0, null()); + } + ifnot (exact?) { ;; incomplete subdomain found, must return next resolver (-1) + category = -1; + } + + int pfx_bits = pfx.slice_bits(); + + ;; pfx.slice_bits() will contain 8m, where m is number of bytes in subdomain + ;; COUNTING the zero byte (if structurally correct: no multiple-ZB keys) + ;; which corresponds to 8m, m=one plus the number of bytes in the subdomain found) + ifnot (category) { + return (pfx_bits, cat_table); ;; return cell with entire dictionary for 0 + } else { + cell cat_found = cat_table.idict_get_ref(16, category); + return (pfx_bits, cat_found); + } +} + +;; getexpiration needs to know the current time to skip any possible expired +;; subdomains in the chain. it will return 0 if not found or expired. +int getexpirationx(slice domain, int nowtime) inline method_id { + (int exp, _, _, _) = dnsdictlookup(domain, nowtime); + return exp; +} + +int getexpiration(slice domain) method_id { + return getexpirationx(domain, now()); +} + +int getstdperiod() method_id { + (int stdper, _, _, _) = load_prices(); + return stdper; +} + +int getppr() method_id { + (_, int ppr, _, _) = load_prices(); + return ppr; +} + +int getppc() method_id { + (_, _, int ppc, _) = load_prices(); + return ppc; +} + +int getppb() method_id { + ( _, _, _, int ppb) = load_prices(); + return ppb; +} + +int calcprice(slice domain, cell val) method_id { ;; only for external gets (not efficient) + (_, _, int ppc, int ppb) = load_prices(); + return calcprice_internal(domain, val, ppc, ppb); +} + +int calcregprice(slice domain, cell val) method_id { ;; only for external gets (not efficient) + (_, int ppr, int ppc, int ppb) = load_prices(); + return ppr + calcprice_internal(domain, val, ppc, ppb); +} diff --git a/submodules/ton/tonlib-src/crypto/smartcont/dns-manual-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/dns-manual-code.fc new file mode 100644 index 0000000000..890d5d86fa --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/dns-manual-code.fc @@ -0,0 +1,348 @@ +{- + Originally created by: + /------------------------------------------------------------------------\ + | Created for: Telegram (Open Network) Blockchain Contest | + | Task 3: DNS Resolver (Manually controlled) | + >------------------------------------------------------------------------< + | Author: Oleksandr Murzin (tg: @skydev / em: alexhacker64@gmail.com) | + | October 2019 | + \------------------------------------------------------------------------/ +-} + +;;===========================================================================;; +;; Custom ASM instructions ;; +;;===========================================================================;; + +(cell, ()) pfxdict_set_ref(cell dict, int key_len, slice key, cell value) { + throw_unless(33, dict~pfxdict_set?(key_len, key, begin_cell().store_maybe_ref(value).end_cell().begin_parse())); + return (dict, ()); +} + +(slice, cell, slice, int) pfxdict_get_ref(cell dict, int key_len, slice key) inline_ref { + (slice pfx, slice val, slice tail, int succ) = dict.pfxdict_get?(key_len, key); + cell res = succ ? val~load_maybe_ref() : null(); + return (pfx, res, tail, succ); +} + +;;===========================================================================;; +;; Utility functions ;; +;;===========================================================================;; + +(int, int, int, cell, cell) load_data() inline_ref { + slice cs = get_data().begin_parse(); + var res = (cs~load_uint(32), cs~load_uint(64), cs~load_uint(256), cs~load_dict(), cs~load_dict()); + cs.end_parse(); + return res; +} + +() store_data(int contract_id, int last_cleaned, int public_key, cell root, old_queries) impure { + set_data(begin_cell() + .store_uint(contract_id, 32) + .store_uint(last_cleaned, 64) + .store_uint(public_key, 256) + .store_dict(root) + .store_dict(old_queries) + .end_cell()); +} + +;;===========================================================================;; +;; Internal message handler (Code 0) ;; +;;===========================================================================;; + +() recv_internal(int msg_value, cell in_msg_cell, slice in_msg) impure { + ;; not interested at all +} + +;;===========================================================================;; +;; External message handler (Code -1) ;; +;;===========================================================================;; + +{- + External message structure: + [Bytes<512b>:signature] [UInt<32b>:seqno] [UInt<6b>:operation] + [Either b0: inline name (<= 58-x Bytes) or b1: reference-stored name) + x depends on operation + Use of 6-bit op instead of 32-bit allows to save 4 bytes for inline name + Inline [Name] structure: [UInt<6b>:length] [Bytes:data] + Operations (continuation of message): + 00 Contract initialization message (only if seqno = 0) (x=-) + 11 VSet: set specified value to specified subdomain->category (x=2) + [Int<16b>:category] [Name:subdomain] [Cell<1r>:value] + 12 VDel: delete specified subdomain->category (x=2) + [Int<16b>:category] [Name:subdomain] + 21 DSet: replace entire category dictionary of domain with provided (x=0) + [Name:subdomain] [Cell<1r>:new_cat_table] + 22 DDel: delete entire category dictionary of specified domain (x=0) + [Name:subdomain] + 31 TSet: replace ENTIRE DOMAIN TABLE with the provided tree root cell (x=-) + [Cell<1r>:new_domains_table] + 32 TDel: nullify ENTIRE DOMAIN TABLE (x=-) + 51 OSet: replace owner public key with a new one (x=-) + [UInt<256b>:new_public_key] +-} + +() after_code_upgrade(cell root, slice ops, cont old_code) impure method_id(1666); + +(cell, slice) process_op(cell root, slice ops) inline_ref { + int op = ops~load_uint(6); + if (op < 10) { + ifnot (op) { + ;; 00 Noop: No operation + return (root, ops); + } + if (op == 1) { + ;; 01 SMsg: Send Message + var mode = ops~load_uint(8); + send_raw_message(ops~load_ref(), mode); + return (root, ops); + } + if (op == 9) { + ;; 09 CodeUpgrade + var new_code = ops~load_ref(); + set_code(new_code); + var old_code = get_c3(); + set_c3(new_code.begin_parse().bless()); + after_code_upgrade(root, ops, old_code); + throw(0); + return (root, ops); + } + throw(45); + return (root, ops); + } + int cat = 0; + if (op < 20) { + ;; for operations with codes 10..19 category is required + cat = ops~load_int(16); + } + slice name = null(); ;; any slice value + cell cat_table = null(); + if (op < 30) { + ;; for operations with codes 10..29 name is required + int is_name_ref = (ops~load_uint(1) == 1); + if (is_name_ref) { + ;; name is stored in separate referenced cell + name = ops~load_ref().begin_parse(); + } else { + ;; name is stored inline + int name_len = ops~load_uint(6) * 8; + name = ops~load_bits(name_len); + } + ;; at least one character not counting \0 + throw_unless(38, name.slice_bits() >= 16); + ;; name shall end with \0 + int name_last_byte = name.slice_last(8).preload_uint(8); + throw_if(40, name_last_byte); + ;; count zero separators + int zeros = 0; + slice cname = name; + repeat (cname.slice_bits() ^>> 3) { + int c = cname~load_uint(8); + zeros -= (c == 0); + } + ;; throw_unless(39, zeros == 1); + name = begin_cell().store_uint(zeros, 7).store_slice(name).end_cell().begin_parse(); + } + ;; operation with codes 10..19 manipulate category dict + ;; lets try to find it and store into a variable + ;; operations with codes 20..29 replace / delete dict, no need + if (op < 20) { + ;; lets resolve the name here so as not to duplicate the code + (slice pfx, cell val, slice tail, int succ) = + root.pfxdict_get_ref(1023, name); + if (succ) { + ;; must match EXACTLY to prevent accident changes + throw_unless(35, tail.slice_empty?()); + cat_table = val; + } + ;; otherwise cat_table is null which is reasonable for actions + } + ;; 11 VSet: set specified value to specified subdomain->category + if (op == 11) { + cell new_value = ops~load_maybe_ref(); + cat_table~idict_set_get_ref(16, cat, new_value); + root~pfxdict_set_ref(1023, name, cat_table); + return (root, ops); + } + ;; 12 VDel: delete specified subdomain->category value + if (op == 12) { + if (cat_table~idict_delete?(16, cat)) { + root~pfxdict_set_ref(1023, name, cat_table); + } + return (root, ops); + } + ;; 21 DSet: replace entire category dictionary of domain with provided + if (op == 21) { + cell new_cat_table = ops~load_maybe_ref(); + root~pfxdict_set_ref(1023, name, new_cat_table); + return (root, ops); + } + ;; 22 DDel: delete entire category dictionary of specified domain + if (op == 22) { + root~pfxdict_delete?(1023, name); + return (root, ops); + } + ;; 31 TSet: replace ENTIRE DOMAIN TABLE with the provided tree root cell + if (op == 31) { + cell new_tree_root = ops~load_maybe_ref(); + ;; no sanity checks cause they would cost immense gas + return (new_tree_root, ops); + } + ;; 32 TDel: nullify ENTIRE DOMAIN TABLE + if (op == 32) { + return (null(), ops); + } + throw(44); ;; invalid operation + return (null(), ops); +} + +cell process_ops(cell root, slice ops) inline_ref { + var stop = false; + root~touch(); + ops~touch(); + do { + (root, ops) = process_op(root, ops); + if (ops.slice_data_empty?()) { + if (ops.slice_refs()) { + ops = ops~load_ref().begin_parse(); + } else { + stop = true; + } + } + } until (stop); + return root; +} + +() recv_external(slice in_msg) impure { + ;; Load data + (int contract_id, int last_cleaned, int public_key, cell root, cell old_queries) = load_data(); + + ;; validate signature and seqno + slice signature = in_msg~load_bits(512); + int shash = slice_hash(in_msg); + var (query_contract, query_id) = (in_msg~load_uint(32), in_msg~load_uint(64)); + var bound = (now() << 32); + throw_if(35, query_id < bound); + (_, var found?) = old_queries.udict_get?(64, query_id); + throw_if(32, found?); + throw_unless(34, contract_id == query_contract); + throw_unless(35, check_signature(shash, signature, public_key)); + accept_message(); ;; message is signed by owner, sanity not guaranteed yet + + int op = in_msg.preload_uint(6); + if (op == 51) { + in_msg~skip_bits(6); + public_key = in_msg~load_uint(256); + } else { + root = process_ops(root, in_msg); + } + + bound -= (64 << 32); ;; clean up records expired more than 64 seconds ago + old_queries~udict_set_builder(64, query_id, begin_cell()); + var queries = old_queries; + do { + var (old_queries', i, _, f) = old_queries.udict_delete_get_min(64); + f~touch(); + if (f) { + f = (i < bound); + } + if (f) { + old_queries = old_queries'; + last_cleaned = i; + } + } until (~ f); + + store_data(contract_id, last_cleaned, public_key, root, old_queries); +} + +() after_code_upgrade(cell root, slice ops, cont old_code) impure method_id(1666) { +} + +{- + Data structure: + Root cell: [UInt<32b>:seqno] [UInt<256b>:owner_public_key] + [OptRef<1b+1r?>:HashmapCatTable>:domains] + := HashmapE 16 ^DNSRecord + + STORED DOMAIN NAME SLICE FORMAT: (#ZeroChars<7b>) (Domain name value) + #Zeros allows to simultaneously store, for example, com\0 and com\0google\0 + That will be stored as \1com\0 and \2com\0google\0 (pfx tree has restricitons) + This will allow to resolve more specific requests to subdomains, and resort + to parent domain next resolver lookup if subdomain is not found + com\0goo\0 lookup will, for example look up \2com\0goo\0 and then + \1com\0goo\0 which will return \1com\0 (as per pfx tree) with -1 cat +-} + +;;===========================================================================;; +;; Getter methods ;; +;;===========================================================================;; + +;; Retrieve contract id (in case several contracts are managed with the same private key) +int get_contract_id() method_id { + return get_data().begin_parse().preload_uint(32); +} + +int get_public_key() method_id { + var cs = get_data().begin_parse(); + cs~load_uint(32 + 64); + return cs.preload_uint(256); +} + +;;8m dns-record-value +(int, cell) dnsresolve(slice subdomain, int category) method_id { + int bits = subdomain.slice_bits(); + ifnot (bits) { + return (0, null()); ;; zero-length input + } + throw_if(30, bits & 7); ;; malformed input (~ 8n-bit) + + int name_last_byte = subdomain.slice_last(8).preload_uint(8); + if (name_last_byte) { + subdomain = begin_cell().store_slice(subdomain) ;; append zero byte + .store_uint(0, 8).end_cell().begin_parse(); + bits += 8; + } + if (bits == 8) { + return (0, null()); ;; zero-length input, but with zero byte + } + (_, _, _, cell root, _) = load_data(); + + slice cname = subdomain; + int zeros = 0; + repeat (bits >> 3) { + int c = cname~load_uint(8); + zeros -= (c == 0); + } + + ;; can't move these declarations lower, will cause errors! + slice pfx = cname; + cell val = null(); + slice tail = cname; + + do { + slice pfxname = begin_cell().store_uint(zeros, 7) + .store_slice(subdomain).end_cell().begin_parse(); + (pfx, val, tail, int succ) = root.pfxdict_get_ref(1023, pfxname); + zeros = succ ^ (zeros - 1); ;; break on success + } until (zeros <= 0); + + ifnot (zeros) { + return (0, null()); ;; failed to find entry in prefix dictionary + } + + zeros = - zeros; + + ifnot (tail.slice_empty?()) { ;; if we have tail then len(pfx) < len(subdomain) + category = -1; ;; incomplete subdomain found, must return next resolver (-1) + } + int pfx_bits = pfx.slice_bits() - 7; + cell cat_table = val; + ;; pfx.slice_bits() will contain 8m, where m is number of bytes in subdomain + ;; COUNTING the zero byte (if structurally correct: no multiple-ZB keys) + ;; which corresponds to 8m, m=one plus the number of bytes in the subdomain found) + if (category == 0) { + return (pfx_bits, cat_table); ;; return cell with entire dictionary for 0 + } else { + cell cat_found = cat_table.idict_get_ref(16, category); + return (pfx_bits, cat_found); + } +} diff --git a/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc index fe000c14d4..e3f394e09c 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/elector-code.fc @@ -123,7 +123,7 @@ _ ~credit_to(credits, addr, amount) { } ;; parse current election data var (elect_at, elect_close, min_stake, total_stake, members, failed, finished) = elect.unpack_elect(); - elect_at~dump(); + ;; elect_at~dump(); msg_value -= 1000000000; ;; deduct GR$1 for sending confirmation if ((msg_value << 12) < total_stake) { ;; stake smaller than 1/4096 of the total accumulated stakes, return @@ -338,7 +338,7 @@ int upgrade_code(s_addr, cs, query_id) { var code = cs~load_ref(); set_code(code); ifnot(cs.slice_empty?()) { - set_c3(code); + set_c3(code.begin_parse().bless()); ;; run_method3(1666, s_addr, cs, query_id); after_code_upgrade(s_addr, cs, query_id); throw(0); @@ -443,7 +443,7 @@ _ compute_total_stake(l, n, m_stake) { if (f) { var (stake, _, pubkey) = (min(key~load_uint(128), max_stake), key~load_uint(32), key.preload_uint(256)); var (max_f, _, adnl_addr) = (cs~load_uint(32), cs~load_uint(256), cs.preload_uint(256)); - l = cons(tuple4(stake, max_f, pubkey, adnl_addr), l); + l = cons([stake, max_f, pubkey, adnl_addr], l); } } until (~ f); ;; l is the list of all stakes in decreasing order @@ -468,7 +468,7 @@ _ compute_total_stake(l, n, m_stake) { } ;; we have to select first m validators from list l l1 = touch(l); - l1~dump(); ;; DEBUG + ;; l1~dump(); ;; DEBUG repeat (m - 1) { l1 = cdr(l1); } @@ -480,7 +480,7 @@ _ compute_total_stake(l, n, m_stake) { var vset = new_dict(); var frozen = new_dict(); do { - var (stake, max_f, pubkey, adnl_addr) = l~list_next().untuple4(); + var [stake, max_f, pubkey, adnl_addr] = l~list_next(); ;; lookup source address first var (val, f) = members.udict_get?(256, pubkey); throw_unless(61, f); @@ -733,7 +733,7 @@ int announce_new_elections(ds, elect, credits) { (_, var min_stake) = config_param(17).begin_parse().load_grams(); ;; announce new elections var elect_at = t + elect_begin_before; - elect_at~dump(); + ;; elect_at~dump(); var elect_close = elect_at - elect_end_before; elect = pack_elect(elect_at, elect_close, min_stake, 0, new_dict(), false, false); set_data(begin_cell().store_dict(elect).store_dict(credits).store_slice(ds).end_cell()); @@ -786,12 +786,32 @@ _ participant_list() method_id { do { (id, var fs, var f) = members.udict_get_prev?(256, id); if (f) { - l = cons(pair(id, fs~load_grams()), l); + l = cons([id, fs~load_grams()], l); } } until (~ f); return l; } +;; returns the list of all participants of current elections with their data +_ participant_list_extended() method_id { + var elect = get_data().begin_parse().preload_dict(); + if (elect.null?()) { + return (0, 0, 0, 0, nil, 0, 0); + } + var (elect_at, elect_close, min_stake, total_stake, members, failed, finished) = elect.unpack_elect(); + var l = nil; + var id = (1 << 255) + ((1 << 255) - 1); + do { + (id, var cs, var f) = members.udict_get_prev?(256, id); + if (f) { + var (stake, time, max_factor, addr, adnl_addr) = (cs~load_grams(), cs~load_uint(32), cs~load_uint(32), cs~load_uint(256), cs~load_uint(256)); + cs.end_parse(); + l = cons([id, [stake, max_factor, addr, adnl_addr]], l); + } + } until (~ f); + return (elect_at, elect_close, min_stake, total_stake, l, failed, finished); +} + ;; computes the return stake int compute_returned_stake(int wallet_addr) method_id { var cs = get_data().begin_parse(); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif b/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif index 66d686241e..fefc7e4625 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/gen-zerostate.fif @@ -3,9 +3,10 @@ def? $1 { @' $1 } { "" } cond constant suffix { suffix $+ } : +suffix +256 1<<1- 15 / constant AllOnes wc_master setworkchain --17 setglobalid // negative value means a test instance of the blockchain +-239 setglobalid // negative value means a test instance of the blockchain // Initial state of Workchain 0 (Basic workchain) @@ -16,10 +17,10 @@ dup dup 31 boc+>B dup Bx. cr dup "basestate0" +suffix +".boc" tuck B>file ."(Initial basechain state saved to file " type .")" cr Bhashu dup =: basestate0_fhash -."file hash=" dup x. space 256 u>B dup B>base64url type cr +."file hash=" dup 64x. space 256 u>B dup B>base64url type cr "basestate0" +suffix +".fhash" B>file hashu dup =: basestate0_rhash -."root hash=" dup x. space 256 u>B dup B>base64url type cr +."root hash=" dup 64x. space 256 u>B dup B>base64url type cr "basestate0" +suffix +".rhash" B>file basestate0_rhash basestate0_fhash now 0 2 32 0 add-std-workchain @@ -54,10 +55,11 @@ Libs{ x{ABACABADABACABA} s>c public_lib x{1234} x{5678} |_ s>c private_lib }Libs // libraries -GR$1700000000 // balance +GR$4999990000 // balance 0 // split_depth 0 // ticktock -2 // mode: create +AllOnes 0 * // address +6 // mode: create+setaddr register_smc dup make_special dup constant smc1_addr Masterchain over @@ -82,8 +84,8 @@ Masterchain over // code // data empty_cell // libraries -GR$1000000 // initial balance (1m test Grams) -0 0 2 register_smc +GR$1000 // initial balance (1k test Grams) +0 0 AllOnes 6 * 6 register_smc dup make_special dup constant smc2_addr Masterchain over 2dup ."free test gram giver address = " .addr cr 2dup 6 .Addr cr @@ -120,13 +122,13 @@ Libs{ x{ABACABADABACABA} s>c public_lib x{1234} x{5678} |_ s>c public_lib }Libs // libraries -0x333333333 // balance +GR$666 // balance 0 // split_depth 3 // ticktock: tick 2 // mode: create register_smc dup make_special dup constant smc3_addr -."address = " x. cr +."address = " 64x. cr /* * @@ -139,7 +141,8 @@ empty_cell // libraries GR$10 // balance: 10 grams 0 // split_depth 2 // ticktock: tick -2 // mode: create +AllOnes 3 * // address: -1:333...333 +6 // mode: create + setaddr register_smc dup make_special dup constant smc4_addr dup constant elector_addr Masterchain swap @@ -155,14 +158,15 @@ Masterchain swap 0 capCreateStats config.version! // max-validators max-main-validators min-validators // 9 4 1 config.validator_num! -1000 100 5 config.validator_num! +1000 100 13 config.validator_num! // min-stake max-stake min-total-stake max-factor -GR$10000 GR$10000000 GR$1000000 sg~10 config.validator_stake_limits! +GR$10000 GR$10000000 GR$500000 sg~3 config.validator_stake_limits! // elected-for elect-start-before elect-end-before stakes-frozen-for // 400000 200000 4000 400000 config.election_params! -4000 2000 500 1000 config.election_params! // DEBUG +// 4000 2000 500 1000 config.election_params! // DEBUG +65536 32768 8192 32768 config.election_params! // TestNet DEBUG // config-addr = -1:5555...5555 -256 1<<1- 3 / constant config_addr +AllOnes 5 * constant config_addr config_addr config.config_smc! // elector-addr elector_addr config.elector_smc! @@ -172,8 +176,8 @@ elector_addr config.elector_smc! config.special! // gas_price gas_limit special_gas_limit gas_credit block_gas_limit freeze_due_limit delete_due_limit flat_gas_limit flat_gas_price -- -1000 sg* 1 *M dup 10000 10 *M GR$0.1 GR$1.0 100 100000 config.gas_prices! -10000 sg* 1 *M 10 *M 10000 10 *M GR$0.1 GR$1.0 100 1000000 config.mc_gas_prices! +1000 sg* 1 *M dup 10000 10 *M GR$0.1 GR$1.0 1000 1000000 config.gas_prices! +10000 sg* 1 *M 10 *M 10000 10 *M GR$0.1 GR$1.0 1000 10000000 config.mc_gas_prices! // lump_price bit_price cell_price ihr_factor first_frac next_frac 1000000 1000 sg* 100000 sg* 3/2 sg*/ 1/3 sg*/ 1/3 sg*/ config.fwd_prices! 10000000 10000 sg* 1000000 sg* 3/2 sg*/ 1/3 sg*/ 1/3 sg*/ config.mc_fwd_prices! @@ -211,10 +215,11 @@ now dup orig_vset_valid_for + 0 config.validators! * */ "auto/config-code.fif" include // code in separate source file - // data empty_cell // libraries GR$10 // balance @@ -232,7 +237,7 @@ Masterchain swap */ // pubkey amount `create-wallet1` or pubkey amount `create-wallet2` -PK'PuZPPXK5Rff9SvtoS7Y9lUuEixvy-J6aishYFj3Qn6P0pJMb GR$100000000 create-wallet1 +PK'PuZPPXK5Rff9SvtoS7Y9lUuEixvy-J6aishYFj3Qn6P0pJMb GR$1000000000 create-wallet1 PK'PuYiB1zAWzr4p8j6I681+sGUrRGcn6Ylf7vXl0xaUl/w6Xfg GR$1700000000 create-wallet0 /* diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc index 70abb48e23..8420c1d827 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-code.fc @@ -39,3 +39,9 @@ int seqno() method_id { return get_data().begin_parse().preload_uint(32); } + +int get_public_key() method_id { + var cs = get_data().begin_parse(); + cs~load_uint(64); + return cs.preload_uint(256); +} diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc index 88d7885563..7dd65f9e69 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2-code.fc @@ -63,3 +63,9 @@ int processed?(int query_id) method_id { (_, var found) = old_queries.udict_get?(64, query_id); return found ? true : - (query_id <= last_cleaned); } + +int get_public_key() method_id { + var cs = get_data().begin_parse(); + cs~load_uint(32 + 64); + return cs.preload_uint(256); +} diff --git a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif index b8f0be72e9..fd71f52aae 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/highload-wallet-v2.fif @@ -1,20 +1,41 @@ #!/usr/bin/fift -s "TonUtil.fif" include +"GetOpt.fif" include + +{ show-options-help 1 halt } : usage + +true =: allow-bounce +false =: force-bounce +3 =: send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors +60 =: timeout // external message expires in 60 seconds + +begin-options + " [-n|-b] [-t] []" +cr +tab + +"Creates a request with up to 254 orders loaded from to high-load (sub)wallet created by new-highload-v2-wallet.fif, with private key loaded from file .pk " + +"and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" +cr + +" is a text file with lines `SEND `" + disable-digit-options generic-help-setopt + "n" "--no-bounce" { false =: allow-bounce } short-long-option + "Clears bounce flag" option-help + "b" "--force-bounce" { true =: force-bounce } short-long-option + "Forces bounce flag" option-help + "t" "--timeout" { parse-int =: timeout } short-long-option-arg + "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help + "m" "--mode" { parse-int =: send-mode } short-long-option-arg + "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)" + option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options -{ ."usage: " @' $0 type ." []" cr - ."Creates a request with up to 254 orders loaded from to high-load v2 (sub)wallet created by new-highload-v2-wallet.fif, with private key loaded from file .pk " - ."and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" cr - ." is a text file with lines `SEND `" cr 1 halt -} : usage $# dup 3 < swap 4 > or ' usage if +4 :$1..n $1 =: file-base $2 parse-int dup 32 fits ' usage ifnot =: subwallet-id // parse subwallet-id { subwallet-id (.) $+ } : +subwallet $3 =: order-file -def? $4 { @' $4 } { "wallet-query" } cond constant savefile -3 constant send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors -60 constant timeout // external message expires in 60 seconds +$4 "wallet-query" replace-if-null =: savefile file-base +subwallet +".addr" load-address 2dup 2constant wallet_addr @@ -29,7 +50,7 @@ variable order# order# 0! orders ! order# 1+! } : add-order // b body -- b' -{ tuck [-n|-b] [-t] []" +cr +tab + +"Creates a request with up to 254 orders loaded from to high-load (sub)wallet created by new-highload-wallet.fif, with private key loaded from file .pk " + +"and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" +cr + +" is a text file with lines `SEND `" + disable-digit-options generic-help-setopt + "n" "--no-bounce" { false =: allow-bounce } short-long-option + "Clears bounce flag" option-help + "b" "--force-bounce" { true =: force-bounce } short-long-option + "Forces bounce flag" option-help + "t" "--timeout" { parse-int =: timeout } short-long-option-arg + "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help + "m" "--mode" { parse-int =: send-mode } short-long-option-arg + "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)" + option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options -{ ."usage: " @' $0 type ." []" cr - ."Creates a request with up to 254 orders loaded from to high-load (sub)wallet created by new-highload-wallet.fif, with private key loaded from file .pk " - ."and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" cr - ." is a text file with lines `SEND `" cr 1 halt -} : usage $# dup 4 < swap 5 > or ' usage if +5 :$1..n $1 =: file-base $2 parse-int dup 32 fits ' usage ifnot =: subwallet-id // parse subwallet-id { subwallet-id (.) $+ } : +subwallet $3 parse-int =: seqno $4 =: order-file -def? $5 { @' $5 } { "wallet-query" } cond constant savefile -3 constant send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors -60 constant timeout // external message expires in 60 seconds +$5 "wallet-query" replace-if-null =: savefile file-base +subwallet +".addr" load-address 2dup 2constant wallet_addr @@ -30,7 +51,7 @@ variable order# order# 0! orders ! order# 1+! } : add-order // b body -- b' -{ tuck [-t] [-o] [...]" +cr +tab + +"Creates a request to managed DNS smart contract created by new-manual-dns.fif, with private key loaded from file .pk " + +"and address from -dns.addr, and saves it into ('" savefile $+ +"' by default)" + +cr +" is an operation description, one of" +cr +tab + +"add cat (smc | next | adnl | text )" +cr +tab + +"delete cat " +cr +tab + +"drop " + disable-digit-options generic-help-setopt + "t" "--timeout" { parse-int =: timeout } short-long-option-arg + "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help + "o" "--output" { =: savefile } short-long-option-arg + "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options + +$# 2 < ' usage if +2 :$1..n + +$1 =: file-base +$2 parse-int dup =: contract-id 32 fits ' usage ifnot +{ contract-id (.) $+ } : +contractid + +{ $* @ dup null? { second $@ ! } { drop } cond } : @skip +{ $* @ null? } : @end? +{ $* @ uncons $* ! } : @next +@next @next 2drop + +variable Actions +{ Actions @ cons Actions ! } : register-action + +{ @end? abort"subdomain name expected" @next dup $len 127 > abort"subdomain name too long" +} : parse-domain +{ @end? abort"category number expected" @next (number) 1 <> abort"category must be integer" + dup 16 fits not abort"category does not fit into 16 bit integer" + dup 0= abort"category must be non-zero" +} : parse-cat-num +{ @end? abort"`cat` expected" @next "cat" $= not abort"`cat` expected" parse-cat-num +} : parse-cat +{ @end? abort"smart contract address expected" + @next false parse-load-address drop triple +} : cl-parse-smc-addr +{ @end? abort"adnl address expected" + `adnl @next parse-adnl-addr pair +} : cl-parse-adnl-addr +{ @end? abort"subdomain record value expected" @next + dup "smc" $= { drop `smc cl-parse-smc-addr } { + dup "next" $= { drop `next cl-parse-smc-addr } { + dup "adnl" $= { drop cl-parse-adnl-addr } { + dup "text" $= { drop `text @next pair } { + "unknown record type "' swap $+ +"'" abort + } cond } cond } cond } cond +} : parse-value +{ ."Loading new code BoC from " dup type cr + file>B B>boc +} : load-new-code-from +{ @next dup "add" $= { drop `add parse-domain parse-cat parse-value 4 tuple register-action } { + dup "delete" $= { drop `delete parse-domain parse-cat triple register-action } { + dup "drop" $= { drop `drop parse-domain pair register-action } { + dup "upgrade" $= { drop `upgrade @next load-new-code-from pair register-action } { + "unknown action '" swap $+ +"'" abort + } cond } cond } cond } cond +} : parse-action +{ { @end? not } { parse-action } while } : parse-actions +parse-actions + +file-base +".pk" load-keypair nip constant wallet_pk +file-base +"-dns" +contractid +".addr" load-address +2dup 2constant smc_addr +."Managed manual DNS smart contract address = " 2dup .addr cr 6 .Addr cr + +."Actions: " Actions @ list-reverse .l cr + +// ( S -- S1 .. Sn n ) +{ 1 swap { dup "." $pos dup 0>= } { $| 1 $| nip rot 1+ swap } while drop swap +} : split-by-dots +// ( S -- s ) +{ dup $len dup 0= abort"subdomain cannot be empty" 126 > abort"subdomain too long" + dup 0 chr $pos 1+ abort"subdomain contains null characters" + split-by-dots s +// ( b V -- b' ) +{ dup first + dup `smc eq? { drop untriple 2swap drop x{9fd3} s, -rot Addr, 0 8 u, } { + dup `next eq? { drop untriple 2swap drop x{ba93} s, -rot Addr, } { + dup `adnl eq? { drop second swap x{ad01} s, swap 256 u, 0 8 u, } { + dup `text eq? { drop second swap x{1eda01} s, over $len 8 u, swap $, } { + abort"unknown value type" + } cond } cond } cond } cond +} : value, +{ subdomain>s dup sbits 3 >> + dup 63 > { drop s>c dict, } { rot swap 7 u, swap s, } cond +} : subdomain, +// ( A -- b ) +{ dup first + dup `add eq? { + drop 4 untuple -rot + b +// ( -- b ) +{ Actions @ dup null? { drop } { + uncons swap action>b { over null? not } { + b> swap uncons swap action>b rot ref, + } while nip } cond +} : serialize-actions +serialize-actions +dup brembits 888 < { b> +."Serialized actions are " hashu 32 1<<1- and + =: query_id + +dup ."signing message: " +dup ."resulting external message: " B dup Bx. cr +."Query_id is " query_id dup . ."= 0x" X. cr +."Query expires in " timeout . ."seconds" cr +savefile tuck B>file +."(Saved to file " type .")" cr diff --git a/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc index cbe2d30feb..36e21a7b7f 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/multisig-code.fc @@ -2,21 +2,32 @@ _ unpack_state() inline_ref { var ds = begin_parse(get_data()); - var res = (ds~load_uint(8), ds~load_uint(8), ds~load_uint(64), ds~load_dict(), ds~load_dict()); + var res = (ds~load_uint(32), ds~load_uint(8), ds~load_uint(8), ds~load_uint(64), ds~load_dict(), ds~load_dict()); ds.end_parse(); return res; } -_ pack_state(cell pending_queries, cell public_keys, int last_cleaned, int k, int n) inline_ref { +_ pack_state(cell pending_queries, cell owner_infos, int last_cleaned, int k, int n, int wallet_id) inline_ref { return begin_cell() + .store_uint(wallet_id, 32) .store_uint(n, 8) .store_uint(k, 8) .store_uint(last_cleaned, 64) - .store_dict(public_keys) + .store_dict(owner_infos) .store_dict(pending_queries) .end_cell(); } +_ pack_owner_info(int public_key, int flood) inline_ref { + return begin_cell() + .store_uint(public_key, 256) + .store_uint(flood, 8); +} + +_ unpack_owner_info(slice cs) inline_ref { + return (cs~load_uint(256), cs~load_uint(8)); +} + (int, int) check_signatures(cell public_keys, cell signatures, int hash, int cnt_bits) inline_ref { int cnt = 0; @@ -41,44 +52,60 @@ _ pack_state(cell pending_queries, cell public_keys, int last_cleaned, int k, in return (cnt, cnt_bits); } - () recv_internal(slice in_msg) impure { ;; do nothing for internal messages } -(int, int, slice) unpack_query_data(slice in_msg, int n, slice query, var found?) inline_ref { +(int, int, int, slice) unpack_query_data(slice in_msg, int n, slice query, var found?, int root_i) inline_ref { if (found?) { throw_unless(35, query~load_int(1)); - (int cnt, int cnt_bits, slice msg) = (query~load_uint(8), query~load_uint(n), query); + (int creator_i, int cnt, int cnt_bits, slice msg) = (query~load_uint(8), query~load_uint(8), query~load_uint(n), query); throw_unless(36, slice_hash(msg) == slice_hash(in_msg)); - return (cnt, cnt_bits, msg); + return (creator_i, cnt, cnt_bits, msg); } - return (0, 0, in_msg); + return (root_i, 0, 0, in_msg); } () try_init() impure inline_ref { ;; first query without signatures is always accepted - (int n, int k, int last_cleaned, cell public_keys, cell pending_queries) = unpack_state(); + (int wallet_id, int n, int k, int last_cleaned, cell owner_infos, cell pending_queries) = unpack_state(); throw_if(37, last_cleaned); accept_message(); - set_data(pack_state(pending_queries, public_keys, 1, k, n)); + set_data(pack_state(pending_queries, owner_infos, 1, k, n, wallet_id)); } -cell update_pending_queries(cell pending_queries, slice msg, int query_id, int cnt, int cnt_bits, int n, int k) impure inline_ref { +(cell, cell) update_pending_queries(cell pending_queries, cell owner_infos, slice msg, int query_id, int creator_i, int cnt, int cnt_bits, int n, int k) impure inline_ref { if (cnt >= k) { + accept_message(); while (msg.slice_refs()) { var mode = msg~load_uint(8); send_raw_message(msg~load_ref(), mode); } pending_queries~udict_set_builder(64, query_id, begin_cell().store_int(0, 1)); + + (slice owner_info, var found?) = owner_infos.udict_get?(8, creator_i); + (int public_key, int flood) = unpack_owner_info(owner_info); + owner_infos~udict_set_builder(8, creator_i, pack_owner_info(public_key, flood - 1)); } else { pending_queries~udict_set_builder(64, query_id, begin_cell() .store_uint(1, 1) + .store_uint(creator_i, 8) .store_uint(cnt, 8) .store_uint(cnt_bits, n) .store_slice(msg)); } - return pending_queries; + return (pending_queries, owner_infos); +} + +(int, int) calc_boc_size(int cells, int bits, slice root) { + cells += 1; + bits += root.slice_bits(); + + while (root.slice_refs()) { + (cells, bits) = calc_boc_size(cells, bits, root~load_ref().begin_parse()); + } + + return (cells, bits); } () recv_external(slice in_msg) impure { @@ -92,44 +119,62 @@ cell update_pending_queries(cell pending_queries, slice msg, int query_id, int c int root_hash = slice_hash(in_msg); int root_i = in_msg~load_uint(8); - (int n, int k, int last_cleaned, cell public_keys, cell pending_queries) = unpack_state(); + (int wallet_id, int n, int k, int last_cleaned, cell owner_infos, cell pending_queries) = unpack_state(); last_cleaned -= last_cleaned == 0; - (slice public_key, var found?) = public_keys.udict_get?(8, root_i); + (slice owner_info, var found?) = owner_infos.udict_get?(8, root_i); + (int public_key, int flood) = unpack_owner_info(owner_info); throw_unless(31, found?); - throw_unless(32, check_signature(root_hash, root_signature, public_key.preload_uint(256))); + throw_unless(32, check_signature(root_hash, root_signature, public_key)); cell signatures = in_msg~load_dict(); var hash = slice_hash(in_msg); + int query_wallet_id = in_msg~load_uint(32); + throw_unless(42, query_wallet_id == wallet_id); + int query_id = in_msg~load_uint(64); + (int cnt, int bits) = calc_boc_size(0, 0, in_msg); + throw_if(40, (cnt > 8) | (bits > 2048)); + + (slice query, var found?) = pending_queries.udict_get?(64, query_id); + + ifnot (found?) { + flood += 1; + throw_if(39, flood > 10); + } + var bound = (now() << 32); throw_if(33, query_id < bound); - (slice query, var found?) = pending_queries.udict_get?(64, query_id); - (int cnt, int cnt_bits, slice msg) = unpack_query_data(in_msg, n, query, found?); + (int creator_i, int cnt, int cnt_bits, slice msg) = unpack_query_data(in_msg, n, query, found?, root_i); int mask = 1 << root_i; throw_if(34, cnt_bits & mask); cnt_bits |= mask; cnt += 1; - ;; TODO: reserve some gas or FAIL - accept_message(); + set_gas_limit(100000); - pending_queries = update_pending_queries(pending_queries, msg, query_id, cnt, cnt_bits, n, k); - set_data(pack_state(pending_queries, public_keys, last_cleaned, k, n)); + ifnot (found?) { + owner_infos~udict_set_builder(8, root_i, pack_owner_info(public_key, flood)); + throw_if(41, (cnt < k) & (bound + ((60 * 60) << 32) > query_id)); + } + + (pending_queries, owner_infos) = update_pending_queries(pending_queries, owner_infos, msg, query_id, creator_i, cnt, cnt_bits, n, k); + set_data(pack_state(pending_queries, owner_infos, last_cleaned, k, n, wallet_id)); commit(); int need_save = 0; ifnot (cell_null?(signatures) | (cnt >= k)) { - (int new_cnt, cnt_bits) = check_signatures(public_keys, signatures, hash, cnt_bits); + (int new_cnt, cnt_bits) = check_signatures(owner_infos, signatures, hash, cnt_bits); cnt += new_cnt; - pending_queries = update_pending_queries(pending_queries, msg, query_id, cnt, cnt_bits, n, k); + (pending_queries, owner_infos) = update_pending_queries(pending_queries, owner_infos, msg, query_id, creator_i, cnt, cnt_bits, n, k); need_save = -1; } + accept_message(); bound -= (64 << 32); ;; clean up records expired more than 64 seconds ago int old_last_cleaned = last_cleaned; do { @@ -146,18 +191,18 @@ cell update_pending_queries(cell pending_queries, slice msg, int query_id, int c } until (~ f); if (need_save) { - set_data(pack_state(pending_queries, public_keys, last_cleaned, k, n)); + set_data(pack_state(pending_queries, owner_infos, last_cleaned, k, n, wallet_id)); } } ;; Get methods ;; returns -1 for processed queries, 0 for unprocessed, 1 for unknown (forgotten) (int, int) get_query_state(int query_id) method_id { - (int n, _, int last_cleaned, _, cell pending_queries) = unpack_state(); + (_, int n, _, int last_cleaned, _, cell pending_queries) = unpack_state(); (slice cs, var found) = pending_queries.udict_get?(64, query_id); if (found) { if (cs~load_int(1)) { - cs~load_uint(8); + cs~load_uint(8 + 8); return (0, cs~load_uint(n)); } else { return (-1, 0); @@ -172,8 +217,8 @@ int processed?(int query_id) method_id { return x; } -cell create_init_state(int n, int k, cell public_keys) method_id { - return pack_state(new_dict(), public_keys, 0, k, n); +cell create_init_state(int wallet_id, int n, int k, cell owners_info) method_id { + return pack_state(new_dict(), owners_info, 0, k, n, wallet_id); } cell merge_list(cell a, cell b) { @@ -196,7 +241,7 @@ cell merge_list(cell a, cell b) { } cell get_public_keys() method_id { - (_, _, _, cell public_keys, _) = unpack_state(); + (_, _, _, _, cell public_keys, _) = unpack_state(); return public_keys; } @@ -222,14 +267,14 @@ cell get_public_keys() method_id { } cell messages_by_mask(int mask) method_id { - (int n, _, _, _, cell pending_queries) = unpack_state(); + (_, int n, _, _, _, cell pending_queries) = unpack_state(); int i = -1; cell a = new_dict(); do { (i, var cs, var f) = pending_queries.udict_get_next?(64, i); if (f) { if (cs~load_int(1)) { - int cnt_bits = cs.skip_bits(8).preload_uint(n); + int cnt_bits = cs.skip_bits(8 + 8).preload_uint(n); if (cnt_bits & mask) { a~udict_set_builder(64, i, begin_cell().store_slice(cs)); } @@ -248,7 +293,7 @@ cell get_messages_unsigned() method_id { } (int, int) get_n_k() method_id { - (int n, int k, _, _, _) = unpack_state(); + (_, int n, int k, _, _, _) = unpack_state(); return (n, k); } diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-auto-dns.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-auto-dns.fif new file mode 100644 index 0000000000..3d4848b4d7 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/new-auto-dns.fif @@ -0,0 +1,66 @@ +#!/usr/bin/fift -s +"TonUtil.fif" include +"Asm.fif" include +"GetOpt.fif" include + +{ show-options-help 1 halt } : usage + +Basechain =: wc // create smart contract in basechain +"new-dns-query.boc" =: savefile +0 =: contract-id +variable dns-dict dictnew dns-dict ! + +begin-options + "
[-w] [-r] [-o]" +cr +tab + +"Creates a new automatic dns smart contract with 32-bit identifier controlled from wallet with address
" + +"and saves it into ('" savefile $+ +"' by default)" + disable-digit-options generic-help-setopt + "w" "--workchain" { parse-workchain-id =: wc } short-long-option-arg + "Selects workchain to create smart contract (" wc (.) $+ +" by default)" option-help + "r" "--random-id" { parse-int =: contract-id } short-long-option-arg + "Sets 'random' smart contract identifier (" contract-id (.) $+ +" by default)" option-help + "o" "--output" { =: savefile } short-long-option-arg + "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options + +$# 6 <> ' usage if +6 :$1..n +$1 =: file-base +$2 false parse-load-address drop 2=: ctl-addr +$3 parse-int dup 0 10000000 in-range? ' usage ifnot =: reg-period +$4 $>GR =: reg-price +$5 parse-int dup 0< ' usage if =: ng-pb +$6 parse-int dup 0< ' usage if =: ng-pc +contract-id 32 fits ' usage ifnot +{ contract-id ?dup { (.) $+ } if } : +contractid + +."Creating new automatic DNS smart contract in workchain " wc . +."with random id " contract-id . cr +."Controlling wallet (smart contract) is " ctl-addr 6 .Addr cr +."Subdomain registration period is " reg-period . ."seconds" cr +."Subdomain registration price is " reg-price .GR +."+ " ng-pc . ."per cell + " ng-pb . ."per bit" cr + +// Create new automatic DNS; source code included from `auto/dns-auto-code.fif` +"auto/dns-auto-code.fif" include +// code + ref, // ctl + dns-dict @ dict, dictnew dict, // dom_dict gc + reg-period 30 u, reg-price Gram, ng-pc Gram, ng-pb Gram, // stdper ppc ppb + 0 64 u, // nhk lhk +b> // data +null // no libraries + // create StateInit +dup ."StateInit: " +dup ."External message for initialization is " B dup Bx. cr +savefile tuck B>file +."(Saved dns smart-contract creating query to file " type .")" cr diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-manual-dns.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-manual-dns.fif new file mode 100644 index 0000000000..47b57bbee3 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smartcont/new-manual-dns.fif @@ -0,0 +1,63 @@ +#!/usr/bin/fift -s +"TonUtil.fif" include +"Asm.fif" include +"GetOpt.fif" include + +{ show-options-help 1 halt } : usage + +Basechain =: wc // create smart contract in basechain +65536 =: timeout +"new-dns-query.boc" =: savefile +variable dns-dict dictnew dns-dict ! + +begin-options + " [-w] [-t] [-o]" +cr +tab + +"Creates a new manual dns smart contract with 32-bit identifier managed by private key .pk, " + +"and saves it into ('" savefile $+ +"' by default)" + disable-digit-options generic-help-setopt + "w" "--workchain" { parse-workchain-id =: wc } short-long-option-arg + "Selects workchain to create smart contract (" wc (.) $+ +" by default)" option-help + "t" "--timeout" { parse-int =: timeout } short-long-option-arg + "Sets expiration timeout for the initialization message in seconds (" timeout (.) $+ +" by default)" option-help + "o" "--output" { =: savefile } short-long-option-arg + "Sets output file for generated initialization message ('" savefile $+ +"' by default)" option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options + +$# 2 <> ' usage if +2 :$1..n +$1 =: file-base +$2 parse-int dup =: contract-id +32 fits ' usage ifnot +{ contract-id (.) $+ } : +contractid + +."Creating new manual DNS smart contract in workchain " wc . +."with contract id " contract-id . cr + +// Create new manual DNS; source code included from `auto/dns-manual-code.fif` +"auto/dns-manual-code.fif" include +// code + // data +null // no libraries + // create StateInit +dup ."StateInit: " +dup ."signing message: " +dup ."External message for initialization is " B dup Bx. cr +savefile tuck B>file +."(Saved dns smart-contract creating query to file " type .")" cr diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif index d59c6c5201..0bb2bcd19c 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v2.fif @@ -15,8 +15,8 @@ def? $2 { @' $2 } { "new-wallet" } cond constant file-base // Create new advanced wallet; code adapted from `auto/wallet-code.fif` <{ SETCP0 DUP IFNOTRET // return if recv_internal - DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method - DROP c4 PUSHCTR CTOS 32 PLDU // cnt + DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods + 1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL // cnt or pubk }> INC 32 THROWIF // fail unless recv_external 9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU // signature in_msg msg_seqno valid_until cs diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif index 187519c9cd..61e392a0e1 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet-v3.fif @@ -2,23 +2,24 @@ "TonUtil.fif" include "Asm.fif" include -{ ."usage: " @' $0 type ." []" cr +{ ."usage: " $0 type ." []" cr ."Creates a new advanced wallet with unique 32-bit identifier in specified workchain, with private key saved to or loaded from .pk" cr ."('new-wallet.pk' by default)" cr 1 halt } : usage $# 2- -2 and ' usage if +3 :$1..n $1 parse-workchain-id =: wc // set workchain id from command line argument $2 parse-int =: subwallet-id -def? $3 { @' $3 } { "new-wallet" } cond constant file-base +$3 "new-wallet" replace-if-null =: file-base ."Creating new advanced v3 wallet in workchain " wc . cr ."with unique wallet id " subwallet-id . cr // Create new advanced wallet; code adapted from `auto/wallet3-code.fif` <{ SETCP0 DUP IFNOTRET // return if recv_internal - DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method - DROP c4 PUSHCTR CTOS 32 PLDU // cnt + DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods + 1 INT AND c4 PUSHCTR CTOS 32 LDU 32 LDU NIP 256 PLDU CONDSEL // cnt or pubk }> INC 32 THROWIF // fail unless recv_external 9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU 32 LDU // signature in_msg subwallet_id valid_until msg_seqno cs diff --git a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif index ac8d4a0e3a..b1aead9000 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/new-wallet.fif @@ -15,8 +15,8 @@ def? $2 { @' $2 } { "new-wallet" } cond constant file-base // Create new simple wallet <{ SETCP0 DUP IFNOTRET // return if recv_internal - DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method - DROP c4 PUSHCTR CTOS 32 PLDU // cnt + DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods + 1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL // cnt or pubk }> INC 32 THROWIF // fail unless recv_external 512 INT LDSLICEX DUP 32 PLDU // sign cs cnt diff --git a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc index 83639dfdff..a31683406f 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet-code.fc @@ -62,6 +62,12 @@ int seqno() method_id { return get_data().begin_parse().preload_uint(32); } -int balance() method_id { - return restricted?() ? 0 : get_balance().first(); +int get_public_key() method_id { + var cs = get_data().begin_parse(); + cs~load_uint(32); + return cs.preload_uint(256); +} + +int balance() method_id { + return restricted?() ? 0 : get_balance().pair_first(); } diff --git a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc index fa57e77d24..8d509886e1 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/restricted-wallet2-code.fc @@ -55,12 +55,18 @@ int seqno() method_id { return get_data().begin_parse().preload_uint(32); } +int get_public_key() method_id { + var cs = get_data().begin_parse(); + cs~load_uint(32); + return cs.preload_uint(256); +} + int balance() method_id { var ds = get_data().begin_parse().skip_bits(32 + 256); var rdict = ds~load_dict(); ds.end_parse(); var ts = days_passed(); - var balance = get_balance().first(); + var balance = get_balance().pair_first(); var (_, value, found) = rdict.idict_get_preveq?(16, ts); if (found) { balance = max(balance - value~load_grams(), 0); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif b/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif index 5d3094644f..86b314630b 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/show-addr.fif @@ -1,19 +1,20 @@ #!/usr/bin/fift -s "TonUtil.fif" include -{ ."usage: " @' $0 type ." " cr +{ ."usage: " $0 type ." " cr ."Shows the address of a simple wallet created by new-wallet.fif, with address in .addr " ."and private key in file .pk" cr 1 halt } : usage -def? $# { @' $# 1 > ' usage if } if -def? $1 { @' $1 } { "new-wallet" } cond constant file-base +$# 1 > ' usage if +1 :$1..n +$1 "new-wallet" replace-if-null =: file-base file-base +".addr" dup ."Loading wallet address from " type cr file>B 32 B| dup Blen { 32 B>i@ } { drop Basechain } cond constant wallet_wc 256 B>u@ dup constant wallet_addr -."Source wallet address = " wallet_wc ._ .":" x. cr -wallet_wc wallet_addr 2dup 7 smca>$ ."Non-bounceable address (for init only): " type cr -6 smca>$ ."Bounceable address (for later access): " type cr +."Source wallet address = " wallet_wc swap 2dup .addr cr +."Non-bounceable address (for init only): " 2dup 7 .Addr cr +."Bounceable address (for later access): " 6 .Addr cr file-base +".pk" dup file-exists? { dup file>B dup Blen 32 <> abort"Private key must be exactly 32 bytes long" diff --git a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc index 266bc9ac1f..a43b8b9299 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-code.fc @@ -15,7 +15,7 @@ throw_unless(33, msg_seqno == stored_seqno); throw_unless(34, check_signature(slice_hash(in_msg), signature, public_key)); accept_message(); - cs~touch_slice(); + cs~touch(); if (cs.slice_refs()) { var mode = cs~load_uint(8); send_raw_message(cs~load_ref(), mode); diff --git a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc index a20b96a861..fb43e83325 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/simple-wallet-ext-code.fc @@ -30,7 +30,7 @@ slice do_verify_message(slice in_msg, int seqno, int public_key) { (int stored_seqno, int public_key) = load_state(); var cs = do_verify_message(in_msg, stored_seqno, public_key); accept_message(); - cs~touch_slice(); + cs~touch(); if (cs.slice_refs()) { var mode = cs~load_uint(8); send_raw_message(cs~load_ref(), mode); @@ -45,6 +45,11 @@ int seqno() method_id { return get_data().begin_parse().preload_uint(32); } +int get_public_key() method_id { + var (seqno, public_key) = load_state(); + return public_key; +} + cell create_init_state(int public_key) method_id { return create_state(0, public_key); } @@ -57,11 +62,7 @@ cell prepare_send_message(int mode, cell msg) method_id { return prepare_send_message_with_seqno(mode, msg, seqno()); } - slice verify_message(slice msg) method_id { var (stored_seqno, public_key) = load_state(); return do_verify_message(msg, stored_seqno, public_key); } - - - diff --git a/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc b/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc index 0798a0a1b5..ca8337e133 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/stdlib.fc @@ -6,21 +6,34 @@ forall X -> (X, tuple) uncons(tuple list) asm "UNCONS"; forall X -> (tuple, X) list_next(tuple list) asm( -> 1 0) "UNCONS"; forall X -> X car(tuple list) asm "CAR"; tuple cdr(tuple list) asm "CDR"; -forall X, Y -> tuple pair(X x, Y y) asm "PAIR"; -forall X, Y -> (X, Y) unpair(tuple t) asm "UNPAIR"; -forall X, Y, Z -> tuple triple(X x, Y y, Z z) asm "TRIPLE"; -forall X, Y, Z -> (X, Y, Z) untriple(tuple t) asm "UNTRIPLE"; -forall X, Y, Z, W -> tuple tuple4(X x, Y y, Z z, W w) asm "4 TUPLE"; -forall X, Y, Z, W -> (X, Y, Z, W) untuple4(tuple t) asm "4 UNTUPLE"; +tuple empty_tuple() asm "NIL"; +forall X -> tuple tpush(tuple t, X value) asm "TPUSH"; +forall X -> (tuple, ()) ~tpush(tuple t, X value) asm "TPUSH"; +forall X -> [X] single(X x) asm "SINGLE"; +forall X -> X unsingle([X] t) asm "UNSINGLE"; +forall X, Y -> [X, Y] pair(X x, Y y) asm "PAIR"; +forall X, Y -> (X, Y) unpair([X, Y] t) asm "UNPAIR"; +forall X, Y, Z -> [X, Y, Z] triple(X x, Y y, Z z) asm "TRIPLE"; +forall X, Y, Z -> (X, Y, Z) untriple([X, Y, Z] t) asm "UNTRIPLE"; +forall X, Y, Z, W -> [X, Y, Z, W] tuple4(X x, Y y, Z z, W w) asm "4 TUPLE"; +forall X, Y, Z, W -> (X, Y, Z, W) untuple4([X, Y, Z, W] t) asm "4 UNTUPLE"; forall X -> X first(tuple t) asm "FIRST"; forall X -> X second(tuple t) asm "SECOND"; forall X -> X third(tuple t) asm "THIRD"; forall X -> X fourth(tuple t) asm "3 INDEX"; +forall X, Y -> X pair_first([X, Y] p) asm "FIRST"; +forall X, Y -> Y pair_second([X, Y] p) asm "SECOND"; +forall X, Y, Z -> X triple_first([X, Y, Z] p) asm "FIRST"; +forall X, Y, Z -> Y triple_second([X, Y, Z] p) asm "SECOND"; +forall X, Y, Z -> Z triple_third([X, Y, Z] p) asm "THIRD"; forall X -> X null() asm "PUSHNULL"; +forall X -> (X, ()) ~impure_touch(X x) impure asm "NOP"; int now() asm "NOW"; slice my_address() asm "MYADDR"; -tuple get_balance() asm "BALANCE"; +[int, cell] get_balance() asm "BALANCE"; +int cur_lt() asm "LTIME"; +int block_lt() asm "BLOCKLT"; int cell_hash(cell c) asm "HASHCU"; int slice_hash(slice s) asm "HASHSU"; @@ -29,16 +42,23 @@ int string_hash(slice s) asm "SHA256U"; int check_signature(int hash, slice signature, int public_key) asm "CHKSIGNU"; int check_data_signature(slice data, slice signature, int public_key) asm "CHKSIGNS"; +(int, int, int) compute_data_size(cell c, int max_cells) asm "CDATASIZE"; +(int, int, int) slice_compute_data_size(slice s, int max_cells) asm "SDATASIZE"; + ;; () throw_if(int excno, int cond) impure asm "THROWARGIF"; () dump_stack() impure asm "DUMPSTK"; cell get_data() asm "c4 PUSH"; () set_data(cell c) impure asm "c4 POP"; -cell get_c3() impure asm "c3 PUSH"; -() set_c3(cell c) impure asm "c3 POP"; +cont get_c3() impure asm "c3 PUSH"; +() set_c3(cont c) impure asm "c3 POP"; +cont bless(slice s) impure asm "BLESS"; + () accept_message() impure asm "ACCEPT"; +() set_gas_limit(int limit) impure asm "SETGASLIMIT"; () commit() impure asm "COMMIT"; +() buy_gas(int gram) impure asm "BUYGAS"; int min(int x, int y) asm "MIN"; int max(int x, int y) asm "MAX"; @@ -59,16 +79,28 @@ slice skip_bits(slice s, int len) asm "SDSKIPFIRST"; slice first_bits(slice s, int len) asm "SDCUTFIRST"; slice skip_last_bits(slice s, int len) asm "SDSKIPLAST"; (slice, ()) ~skip_last_bits(slice s, int len) asm "SDSKIPLAST"; +slice slice_last(slice s, int len) asm "SDCUTLAST"; (slice, cell) load_dict(slice s) asm( -> 1 0) "LDDICT"; cell preload_dict(slice s) asm "PLDDICT"; slice skip_dict(slice s) asm "SKIPDICT"; +(slice, cell) load_maybe_ref(slice s) asm( -> 1 0) "LDOPTREF"; +cell preload_maybe_ref(slice s) asm "PLDOPTREF"; +builder store_maybe_ref(builder b, cell c) asm(c b) "STOPTREF"; + +int cell_depth(cell c) asm "CDEPTH"; + int slice_refs(slice s) asm "SREFS"; int slice_bits(slice s) asm "SBITS"; (int, int) slice_bits_refs(slice s) asm "SBITREFS"; int slice_empty?(slice s) asm "SEMPTY"; int slice_data_empty?(slice s) asm "SDEMPTY"; int slice_refs_empty?(slice s) asm "SREMPTY"; +int slice_depth(slice s) asm "SDEPTH"; + +int builder_refs(builder b) asm "BREFS"; +int builder_bits(builder b) asm "BBITS"; +int builder_depth(builder b) asm "BDEPTH"; builder begin_cell() asm "NEWC"; cell end_cell(builder b) asm "ENDC"; @@ -89,7 +121,8 @@ cell idict_set_ref(cell dict, int key_len, int index, cell value) asm(value inde cell udict_set_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTUSETREF"; (cell, ()) ~udict_set_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTUSETREF"; cell idict_get_ref(cell dict, int key_len, int index) asm(index dict key_len) "DICTIGETOPTREF"; -cell udict_get_ref(cell dict, int key_len, int index) asm(index dict key_len) "DICTUGETOPTREF"; +(cell, int) idict_get_ref?(cell dict, int key_len, int index) asm(index dict key_len) "DICTIGETREF"; +(cell, int) udict_get_ref?(cell dict, int key_len, int index) asm(index dict key_len) "DICTUGETREF"; (cell, cell) idict_set_get_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTISETGETOPTREF"; (cell, cell) udict_set_get_ref(cell dict, int key_len, int index, cell value) asm(value index dict key_len) "DICTUSETGETOPTREF"; (cell, int) idict_delete?(cell dict, int key_len, int index) asm(index dict key_len) "DICTIDEL"; @@ -120,36 +153,52 @@ cell dict_set_builder(cell dict, int key_len, slice index, builder value) asm(va (cell, int) udict_replace_builder?(cell dict, int key_len, int index, builder value) asm(value index dict key_len) "DICTUREPLACEB"; (cell, int) idict_add_builder?(cell dict, int key_len, int index, builder value) asm(value index dict key_len) "DICTIADDB"; (cell, int) idict_replace_builder?(cell dict, int key_len, int index, builder value) asm(value index dict key_len) "DICTIREPLACEB"; -(cell, int, slice, int) udict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, (int, slice, int)) ~udict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, int, slice, int) idict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, (int, slice, int)) ~idict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, slice, slice, int) dict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, (slice, slice, int)) ~dict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, int, slice, int) udict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, (int, slice, int)) ~udict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, int, slice, int) idict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, (int, slice, int)) ~idict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, slice, slice, int) dict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(cell, (slice, slice, int)) ~dict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) udict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXT" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) udict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXTEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) udict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREV" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) udict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREVEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) idict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXT" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) idict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXTEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) idict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREV" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; -(int, slice, int) idict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREVEQ" "NULLSWAPIFNOT" "NULLSWAPIFNOT"; +(cell, int, slice, int) udict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT2"; +(cell, (int, slice, int)) ~udict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMIN" "NULLSWAPIFNOT2"; +(cell, int, slice, int) idict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT2"; +(cell, (int, slice, int)) ~idict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMIN" "NULLSWAPIFNOT2"; +(cell, slice, slice, int) dict_delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT2"; +(cell, (slice, slice, int)) ~dict::delete_get_min(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMIN" "NULLSWAPIFNOT2"; +(cell, int, slice, int) udict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT2"; +(cell, (int, slice, int)) ~udict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTUREMMAX" "NULLSWAPIFNOT2"; +(cell, int, slice, int) idict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT2"; +(cell, (int, slice, int)) ~idict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTIREMMAX" "NULLSWAPIFNOT2"; +(cell, slice, slice, int) dict_delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT2"; +(cell, (slice, slice, int)) ~dict::delete_get_max(cell dict, int key_len) asm(-> 0 2 1 3) "DICTREMMAX" "NULLSWAPIFNOT2"; +(int, slice, int) udict_get_min?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMIN" "NULLSWAPIFNOT2"; +(int, slice, int) udict_get_max?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMAX" "NULLSWAPIFNOT2"; +(int, cell, int) udict_get_min_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMINREF" "NULLSWAPIFNOT2"; +(int, cell, int) udict_get_max_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTUMAXREF" "NULLSWAPIFNOT2"; +(int, slice, int) idict_get_min?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMIN" "NULLSWAPIFNOT2"; +(int, slice, int) idict_get_max?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMAX" "NULLSWAPIFNOT2"; +(int, cell, int) idict_get_min_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMINREF" "NULLSWAPIFNOT2"; +(int, cell, int) idict_get_max_ref?(cell dict, int key_len) asm (-> 1 0 2) "DICTIMAXREF" "NULLSWAPIFNOT2"; +(int, slice, int) udict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXT" "NULLSWAPIFNOT2"; +(int, slice, int) udict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETNEXTEQ" "NULLSWAPIFNOT2"; +(int, slice, int) udict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREV" "NULLSWAPIFNOT2"; +(int, slice, int) udict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTUGETPREVEQ" "NULLSWAPIFNOT2"; +(int, slice, int) idict_get_next?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXT" "NULLSWAPIFNOT2"; +(int, slice, int) idict_get_nexteq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETNEXTEQ" "NULLSWAPIFNOT2"; +(int, slice, int) idict_get_prev?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREV" "NULLSWAPIFNOT2"; +(int, slice, int) idict_get_preveq?(cell dict, int key_len, int pivot) asm(pivot dict key_len -> 1 0 2) "DICTIGETPREVEQ" "NULLSWAPIFNOT2"; cell new_dict() asm "NEWDICT"; int dict_empty?(cell c) asm "DICTEMPTY"; +(slice, slice, slice, int) pfxdict_get?(cell dict, int key_len, slice key) asm(key dict key_len) "PFXDICTGETQ" "NULLSWAPIFNOT2"; +(cell, int) pfxdict_set?(cell dict, int key_len, slice key, slice value) asm(value key dict key_len) "PFXDICTSET"; +(cell, int) pfxdict_delete?(cell dict, int key_len, slice key) asm(key dict key_len) "PFXDICTDEL"; + cell config_param(int x) asm "CONFIGOPTPARAM"; int cell_null?(cell c) asm "ISNULL"; () raw_reserve(int amount, int mode) impure asm "RAWRESERVE"; -() raw_reserve_extra(slice currencies, int mode) impure asm "RAWRESERVEX"; +() raw_reserve_extra(int amount, cell extra_amount, int mode) impure asm "RAWRESERVEX"; () send_raw_message(cell msg, int mode) impure asm "SENDRAWMSG"; () set_code(cell new_code) impure asm "SETCODE"; -slice touch_slice(slice s) asm "NOP"; -(slice,()) ~touch_slice(slice s) asm "NOP"; +int random() impure asm "RANDU256"; +int rand(int range) impure asm "RAND"; +int get_seed() impure asm "RANDSEED"; +int set_seed() impure asm "SETRAND"; +() randomize(int x) impure asm "ADDRAND"; +() randomize_lt() impure asm "LTIME" "ADDRAND"; diff --git a/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif b/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif index 33e5fbcebc..3924363223 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/update-config-smc.fif @@ -1,7 +1,7 @@ #!/usr/bin/fift -s "TonUtil.fif" include -{ ."usage: " @' $0 type ." []" cr +{ ."usage: " $0 type ." []" cr ."Creates a request to simple configuration smart contract requesting to change configuration smart contract code to the one currently stored in auto/config-code.fif, " ."with private key loaded from file .pk, " ."and saves it into .boc ('config-query.boc' by default)" cr 1 halt @@ -9,15 +9,16 @@ $# dup 2 < swap 3 > or ' usage if "config-master" constant file-base -0 constant seqno +0 constant qseqno -1 constant idx true constant bounce "auto/config-code.fif" constant config-source 100 constant interval // valid for 100 seconds +3 :$1..n $1 =: file-base -$2 parse-int =: seqno -def? $3 { @' $3 } { "config-query" } cond constant savefile +$2 parse-int =: qseqno +$3 "config-query" replace-if-null constant savefile file-base +".addr" load-address 2dup 2constant config_addr @@ -30,7 +31,7 @@ config-source include dup + dup ."signing message: " B B+ max_factor 32 u>B B+ src_addr 256 u>B B+ adnl_addr 256 u>B B+ dup Bx. cr diff --git a/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif b/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif index 55e3d9ddac..4e681f07dc 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/validator-elect-signed.fif @@ -27,7 +27,7 @@ def? $7 { @' $7 } { "validator-query.boc" } cond constant output_fname ."Creating a request to participate in validator elections at time " elect_time . ."from smart contract " -1 src_addr 2dup 1 .Addr ." = " .addr ." with maximal stake factor with respect to the minimal stake " max_factor ._ -."/65536 and validator ADNL address " adnl_addr x. cr +."/65536 and validator ADNL address " adnl_addr 64x. cr B{654c5074} elect_time 32 u>B B+ max_factor 32 u>B B+ src_addr 256 u>B B+ adnl_addr 256 u>B B+ ."String to sign is: " dup Bx. cr constant to_sign diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc b/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc index 3ce2fac154..9d4cddb71b 100644 --- a/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc +++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet-code.fc @@ -29,3 +29,9 @@ int seqno() method_id { return get_data().begin_parse().preload_uint(32); } + +int get_public_key() method_id { + var cs = get_data().begin_parse(); + cs~load_uint(32); + return cs.preload_uint(256); +} diff --git a/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif b/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif index 3d36643b45..f01ca47e67 100755 --- a/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif +++ b/submodules/ton/tonlib-src/crypto/smartcont/wallet-v2.fif @@ -1,30 +1,52 @@ #!/usr/bin/fift -s "TonUtil.fif" include +"GetOpt.fif" include + +{ show-options-help 1 halt } : usage + +"" =: comment // comment for simple transfers +true =: allow-bounce +false =: force-bounce +3 =: send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors +60 =: timeout // external message expires in 60 seconds + +begin-options + " [-n|-b] [-t] [-B ] [-C ] []" +cr +tab + +"Creates a request to advanced wallet created by new-wallet-v2.fif, with private key loaded from file .pk " + +"and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" + disable-digit-options generic-help-setopt + "n" "--no-bounce" { false =: allow-bounce } short-long-option + "Clears bounce flag" option-help + "b" "--force-bounce" { true =: force-bounce } short-long-option + "Forces bounce flag" option-help + "t" "--timeout" { parse-int =: timeout } short-long-option-arg + "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help + "B" "--body" { =: body-boc-file } short-long-option-arg + "Sets the payload of the transfer message" option-help + "C" "--comment" { =: comment } short-long-option-arg + "Sets the comment to be sent in the transfer message" option-help + "m" "--mode" { parse-int =: send-mode } short-long-option-arg + "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)" + option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options -{ ."usage: " @' $0 type ." [-B ] []" cr - ."Creates a request to advanced wallet created by new-wallet-v2.fif, with private key loaded from file .pk " - ."and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" cr 1 halt -} : usage -def? $6 { @' $5 "-B" $= { @' $6 =: body-boc-file [forget] $6 def? $7 { @' $7 =: $5 [forget] $7 } { [forget] $5 } cond - @' $# 2- =: $# } if } if $# dup 4 < swap 5 > or ' usage if - +5 :$1..n true constant bounce - $1 =: file-base -$2 bounce parse-load-address =: bounce 2=: dest_addr +$2 bounce parse-load-address force-bounce or allow-bounce and =: bounce 2=: dest_addr $3 parse-int =: seqno $4 $>GR =: amount -def? $5 { @' $5 } { "wallet-query" } cond constant savefile -3 constant send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors -60 constant timeout // external message expires in 60 seconds +$5 "wallet-query" replace-if-null =: savefile file-base +".addr" load-address 2dup 2constant wallet_addr ."Source wallet address = " 2dup .addr cr 6 .Addr cr file-base +".pk" load-keypair nip constant wallet_pk -def? body-boc-file { @' body-boc-file file>B B>boc } { } cond +def? body-boc-file { @' body-boc-file file>B B>boc } { comment simple-transfer-body } cond constant body-cell ."Transferring " amount .GR ."to account " @@ -33,8 +55,8 @@ dest_addr 2dup bounce 7 + .Addr ." = " .addr ."Body of transfer message is " body-cell dup ."signing message: " [-n|-b] [-t] [-B ] [-C ] []" +cr +tab + +"Creates a request to advanced wallet created by new-wallet-v3.fif, with private key loaded from file .pk " + +"and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" + disable-digit-options generic-help-setopt + "n" "--no-bounce" { false =: allow-bounce } short-long-option + "Clears bounce flag" option-help + "b" "--force-bounce" { true =: force-bounce } short-long-option + "Forces bounce flag" option-help + "t" "--timeout" { parse-int =: timeout } short-long-option-arg + "Sets expiration timeout in seconds (" timeout (.) $+ +" by default)" option-help + "B" "--body" { =: body-boc-file } short-long-option-arg + "Sets the payload of the transfer message" option-help + "C" "--comment" { =: comment } short-long-option-arg + "Sets the comment to be sent in the transfer message" option-help + "m" "--mode" { parse-int =: send-mode } short-long-option-arg + "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)" + option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options -{ ."usage: " @' $0 type ." [-B ] []" cr - ."Creates a request to advanced wallet created by new-wallet-v3.fif, with private key loaded from file .pk " - ."and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" cr 1 halt -} : usage -def? $7 { @' $6 "-B" $= { @' $7 =: body-boc-file [forget] $7 def? $8 { @' $8 =: $6 [forget] $8 } { [forget] $6 } cond - @' $# 2- =: $# } if } if $# dup 5 < swap 6 > or ' usage if +6 :$1..n true constant bounce - $1 =: file-base -$2 bounce parse-load-address =: bounce 2=: dest_addr +$2 bounce parse-load-address force-bounce or allow-bounce and =: bounce 2=: dest_addr $3 parse-int =: subwallet_id $4 parse-int =: seqno $5 $>GR =: amount -def? $6 { @' $6 } { "wallet-query" } cond constant savefile -3 constant send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors -60 constant timeout // external message expires in 60 seconds +$6 "wallet-query" replace-if-null =: savefile file-base +".addr" load-address 2dup 2constant wallet_addr ."Source wallet address = " 2dup .addr cr 6 .Addr cr file-base +".pk" load-keypair nip constant wallet_pk -def? body-boc-file { @' body-boc-file file>B B>boc } { } cond +def? body-boc-file { @' body-boc-file file>B B>boc } { comment simple-transfer-body } cond constant body-cell ."Transferring " amount .GR ."to account " @@ -35,8 +58,8 @@ dest_addr 2dup bounce 7 + .Addr ." = " .addr ."Body of transfer message is " body-cell dup ."signing message: " [-B ] [-C ] []" cr - ."Creates a request to simple wallet created by new-wallet.fif, with private key loaded from file .pk " - ."and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" cr 1 halt -} : usage "" =: comment // comment for simple transfers -def? $6 { @' $5 dup "-B" $= swap "-C" $= tuck or - { @' $6 swap { =: comment } { =: body-boc-file } cond [forget] $6 - def? $7 { @' $7 =: $5 [forget] $7 } { [forget] $5 } cond - @' $# 2- =: $# - } if -} if +true =: allow-bounce +false =: force-bounce +3 =: send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors + +begin-options + " [-n|-b] [-B ] [-C ] []" +cr +tab + +"Creates a request to simple wallet created by new-wallet.fif, with private key loaded from file .pk " + +"and address from .addr, and saves it into .boc ('wallet-query.boc' by default)" + disable-digit-options generic-help-setopt + "n" "--no-bounce" { false =: allow-bounce } short-long-option + "Clears bounce flag" option-help + "b" "--force-bounce" { true =: force-bounce } short-long-option + "Forces bounce flag" option-help + "B" "--body" { =: body-boc-file } short-long-option-arg + "Sets the payload of the transfer message" option-help + "C" "--comment" { =: comment } short-long-option-arg + "Sets the comment to be sent in the transfer message" option-help + "m" "--mode" { parse-int =: send-mode } short-long-option-arg + "Sets transfer mode (0..255) for SENDRAWMSG (" send-mode (.) $+ +" by default)" + option-help + "h" "--help" { usage } short-long-option + "Shows a help message" option-help +parse-options + $# dup 4 < swap 5 > or ' usage if - -true constant bounce - +5 :$1..n +true =: bounce $1 =: file-base -$2 bounce parse-load-address =: bounce 2=: dest_addr +$2 bounce parse-load-address allow-bounce and force-bounce or =: bounce 2=: dest_addr $3 parse-int =: seqno $4 $>GR =: amount -def? $5 { @' $5 } { "wallet-query" } cond constant savefile -3 constant send-mode // mode for SENDRAWMSG: +1 - sender pays fees, +2 - ignore errors +$5 "wallet-query" replace-if-null =: savefile +allow-bounce not force-bounce and abort"cannot have bounce flag both set and cleared" // "" 1 { 69091 * 1+ 65535 and tuck 2521 / 65 + hold swap } 1000 times drop =: comment file-base +".addr" load-address @@ -38,8 +54,8 @@ dest_addr 2dup bounce 7 + .Addr ." = " .addr ."Body of transfer message is " body-cell dup ."signing message: " . + + Copyright 2017-2020 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 + +namespace ton { +td::Ref 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 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::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 HighloadWallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, + td::uint32 seqno, td::uint32 valid_until, + td::Span gifts) noexcept { + CHECK(gifts.size() <= max_gifts_size); + 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 HighloadWallet::get_init_code() noexcept { + return SmartContractCode::get_code(SmartContractCode::HighloadWalletV1); +} + +vm::CellHash HighloadWallet::get_init_code_hash() noexcept { + return get_init_code()->get_hash(); +} + +td::Ref 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 HighloadWallet::get_seqno() const { + return TRY_VM(get_seqno_or_throw()); +} + +td::Result HighloadWallet::get_seqno_or_throw() const { + if (state_.data.is_null()) { + return 0; + } + //FIXME use get method + return static_cast(vm::load_cell_slice(state_.data).fetch_ulong(32)); +} + +td::Result HighloadWallet::get_wallet_id() const { + return TRY_VM(get_wallet_id_or_throw()); +} + +td::Result 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(cs.fetch_ulong(32)); +} + +td::Result HighloadWallet::get_public_key() const { + return TRY_VM(get_public_key_or_throw()); +} + +td::Result HighloadWallet::get_public_key_or_throw() const { + if (state_.data.is_null()) { + return td::Status::Error("data is null"); + } + //FIXME use get method + auto cs = vm::load_cell_slice(state_.data); + cs.skip_first(64); + td::SecureString res(td::Ed25519::PublicKey::LENGTH); + cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast(res.size())); + return td::Ed25519::PublicKey(std::move(res)); +} + +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.h new file mode 100644 index 0000000000..e1db23efb0 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWallet.h @@ -0,0 +1,63 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#pragma once + +#include "smc-envelope/SmartContract.h" +#include "smc-envelope/WalletInterface.h" +#include "vm/cells.h" +#include "Ed25519.h" +#include "block/block.h" +#include "vm/cells/CellString.h" + +namespace ton { +class HighloadWallet : ton::SmartContract, public WalletInterface { + public: + explicit HighloadWallet(State state) : ton::SmartContract(std::move(state)) { + } + static constexpr unsigned max_message_size = vm::CellString::max_bytes; + static constexpr unsigned max_gifts_size = 254; + static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept; + static td::Ref get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id) noexcept; + static td::Ref make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, + td::uint32 seqno, td::uint32 valid_until, td::Span gifts) noexcept; + + static td::Ref get_init_code() noexcept; + static vm::CellHash get_init_code_hash() noexcept; + static td::Ref get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept; + + td::Result get_seqno() const; + td::Result get_wallet_id() const; + + td::Result> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until, + td::Span gifts) const override { + TRY_RESULT(seqno, get_seqno()); + TRY_RESULT(wallet_id, get_wallet_id()); + return make_a_gift_message(private_key, wallet_id, seqno, valid_until, gifts); + } + size_t get_max_gifts_size() const override { + return max_gifts_size; + } + td::Result get_public_key() const override; + + private: + td::Result get_seqno_or_throw() const; + td::Result get_wallet_id_or_throw() const; + td::Result get_public_key_or_throw() const; +}; +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.cpp new file mode 100644 index 0000000000..dbdb52347a --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.cpp @@ -0,0 +1,151 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#include "HighloadWalletV2.h" +#include "GenericAccount.h" +#include "SmartContractCode.h" + +#include "vm/boc.h" +#include "vm/cells/CellString.h" +#include "td/utils/base64.h" + +#include + +namespace ton { +td::optional HighloadWalletV2::guess_revision(const vm::Cell::Hash& code_hash) { + for (td::int32 i = 1; i <= 2; i++) { + if (get_init_code(i)->get_hash() == code_hash) { + return i; + } + } + return {}; +} +td::optional HighloadWalletV2::guess_revision(const block::StdAddress& address, + const td::Ed25519::PublicKey& public_key, + td::uint32 wallet_id) { + for (td::int32 i = 1; i <= 2; i++) { + if (GenericAccount::get_address(address.workchain, get_init_state(public_key, wallet_id, i)) == address) { + return i; + } + } + return {}; +} +td::Ref HighloadWalletV2::get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, + td::int32 revision) noexcept { + auto code = get_init_code(revision); + auto data = get_init_data(public_key, wallet_id); + return GenericAccount::get_init_state(std::move(code), std::move(data)); +} + +td::Ref HighloadWalletV2::get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, + td::uint32 valid_until) noexcept { + td::uint32 id = -1; + auto append_message = [&](auto&& cb) -> vm::CellBuilder& { + cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(id, 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 HighloadWalletV2::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, + td::uint32 wallet_id, td::uint32 valid_until, + td::Span gifts) noexcept { + CHECK(gifts.size() <= max_gifts_size); + 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); + } + std::string hash; + { + vm::CellBuilder cb; + CHECK(cb.store_maybe_ref(messages.get_root_cell())); + hash = cb.finalize()->get_hash().as_slice().substr(28, 4).str(); + } + + vm::CellBuilder cb; + cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_bytes(hash); + 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 HighloadWalletV2::get_init_code(td::int32 revision) noexcept { + return SmartContractCode::get_code(SmartContractCode::HighloadWalletV2, revision); +} + +vm::CellHash HighloadWalletV2::get_init_code_hash() noexcept { + return get_init_code(0)->get_hash(); +} + +td::Ref HighloadWalletV2::get_init_data(const td::Ed25519::PublicKey& public_key, + td::uint32 wallet_id) noexcept { + vm::CellBuilder cb; + cb.store_long(wallet_id, 32).store_long(0, 64).store_bytes(public_key.as_octet_string()); + CHECK(cb.store_maybe_ref({})); + return cb.finalize(); +} + +td::Result HighloadWalletV2::get_wallet_id() const { + return TRY_VM(get_wallet_id_or_throw()); +} + +td::Result HighloadWalletV2::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); + return static_cast(cs.fetch_ulong(32)); +} + +td::Result HighloadWalletV2::get_public_key() const { + return TRY_VM(get_public_key_or_throw()); +} + +td::Result HighloadWalletV2::get_public_key_or_throw() const { + if (state_.data.is_null()) { + return td::Status::Error("data is null"); + } + //FIXME use get method + auto cs = vm::load_cell_slice(state_.data); + cs.skip_first(96); + td::SecureString res(td::Ed25519::PublicKey::LENGTH); + cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast(res.size())); + return td::Ed25519::PublicKey(std::move(res)); +} + +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.h b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.h new file mode 100644 index 0000000000..2b6f99e7b0 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/HighloadWalletV2.h @@ -0,0 +1,66 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#pragma once + +#include "smc-envelope/SmartContract.h" +#include "smc-envelope/WalletInterface.h" +#include "vm/cells.h" +#include "Ed25519.h" +#include "block/block.h" +#include "vm/cells/CellString.h" + +namespace ton { +class HighloadWalletV2 : ton::SmartContract, public WalletInterface { + public: + explicit HighloadWalletV2(State state) : ton::SmartContract(std::move(state)) { + } + static constexpr unsigned max_message_size = vm::CellString::max_bytes; + static constexpr unsigned max_gifts_size = 254; + static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, + td::int32 revision) noexcept; + static td::Ref get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, + td::uint32 valid_until) noexcept; + + static td::Ref make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, + td::uint32 valid_until, td::Span gifts) noexcept; + + static td::Ref get_init_code(td::int32 revision) noexcept; + static vm::CellHash get_init_code_hash() noexcept; + static td::Ref get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept; + static td::optional guess_revision(const vm::Cell::Hash& code_hash); + static td::optional guess_revision(const block::StdAddress& address, + const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id); + + td::Result get_wallet_id() const; + + td::Result> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until, + td::Span gifts) const override { + TRY_RESULT(wallet_id, get_wallet_id()); + return make_a_gift_message(private_key, wallet_id, valid_until, gifts); + } + size_t get_max_gifts_size() const override { + return max_gifts_size; + } + td::Result get_public_key() const override; + + private: + td::Result get_wallet_id_or_throw() const; + td::Result get_public_key_or_throw() const; +}; +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.cpp new file mode 100644 index 0000000000..00f1becb88 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.cpp @@ -0,0 +1,604 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ +#include "ManualDns.h" + +#include "smc-envelope/SmartContractCode.h" + +#include "vm/dict.h" + +#include "td/utils/format.h" +#include "td/utils/overloaded.h" +#include "td/utils/Parser.h" +#include "td/utils/Random.h" + +#include "block/block-auto.h" +#include "block/block-parse.h" + +#include "common/util.h" + +namespace ton { +td::StringBuilder& operator<<(td::StringBuilder& sb, const ManualDns::EntryData& data) { + switch (data.type) { + case ManualDns::EntryData::Type::Empty: + return sb << "DELETED"; + case ManualDns::EntryData::Type::Text: + return sb << "TEXT:" << data.data.get().text; + case ManualDns::EntryData::Type::NextResolver: + return sb << "NEXT:" << data.data.get().resolver.rserialize(); + case ManualDns::EntryData::Type::AdnlAddress: + return sb << "ADNL:" + << td::adnl_id_encode(data.data.get().adnl_address.as_slice()) + .move_as_ok(); + case ManualDns::EntryData::Type::SmcAddress: + return sb << "SMC:" << data.data.get().smc_address.rserialize(); + } + return sb << ""; +} + +//proto_list_nil$0 = ProtoList; +//proto_list_next$1 head:Protocol tail:ProtoList = ProtoList; +//proto_http#4854 = Protocol; + +//cap_list_nil$0 = SmcCapList; +//cap_list_next$1 head:SmcCapability tail:SmcCapList = SmcCapList; +//cap_method_seqno#5371 = SmcCapability; +//cap_method_pubkey#71f4 = SmcCapability; +//cap_is_wallet#2177 = SmcCapability; +//cap_name#ff name:Text = SmcCapability; +// +td::Result> DnsInterface::EntryData::as_cell() const { + td::Ref res; + td::Status error; + data.visit(td::overloaded( + [&](const EntryDataText& text) { + block::gen::DNSRecord::Record_dns_text dns; + vm::CellBuilder cb; + vm::CellText::store(cb, text.text); + dns.x = vm::load_cell_slice_ref(cb.finalize()); + tlb::pack_cell(res, dns); + }, + [&](const EntryDataNextResolver& resolver) { + block::gen::DNSRecord::Record_dns_next_resolver dns; + vm::CellBuilder cb; + block::tlb::t_MsgAddressInt.store_std_address(cb, resolver.resolver.workchain, resolver.resolver.addr); + dns.resolver = vm::load_cell_slice_ref(cb.finalize()); + tlb::pack_cell(res, dns); + }, + [&](const EntryDataAdnlAddress& adnl_address) { + block::gen::DNSRecord::Record_dns_adnl_address dns; + dns.adnl_addr = adnl_address.adnl_address; + dns.flags = 0; + tlb::pack_cell(res, dns); + }, + [&](const EntryDataSmcAddress& smc_address) { + block::gen::DNSRecord::Record_dns_smc_address dns; + vm::CellBuilder cb; + block::tlb::t_MsgAddressInt.store_std_address(cb, smc_address.smc_address.workchain, + smc_address.smc_address.addr); + dns.smc_addr = vm::load_cell_slice_ref(cb.finalize()); + tlb::pack_cell(res, dns); + })); + if (error.is_error()) { + return error; + } + if (res.is_null()) { + return td::Status::Error("Entry data is emtpy"); + } + return res; + //dns_text#1eda _:Text = DNSRecord; + + //dns_next_resolver#ba93 resolver:MsgAddressInt = DNSRecord; // usually in record #-1 + //dns_adnl_address#ad01 adnl_addr:bits256 flags:(## 8) { flags <= 1 } proto_list:flags . 0?ProtoList = DNSRecord; // often in record #2 + + //dns_smc_address#9fd3 smc_addr:MsgAddressInt flags:(## 8) { flags <= 1 } cap_list:flags . 0?SmcCapList = DNSRecord; // often in record #1 +} + +td::Result DnsInterface::EntryData::from_cellslice(vm::CellSlice& cs) { + switch (block::gen::t_DNSRecord.get_tag(cs)) { + case block::gen::DNSRecord::dns_text: { + block::gen::DNSRecord::Record_dns_text dns; + tlb::unpack(cs, dns); + TRY_RESULT(text, vm::CellText::load(dns.x.write())); + return EntryData::text(std::move(text)); + } + case block::gen::DNSRecord::dns_next_resolver: { + block::gen::DNSRecord::Record_dns_next_resolver dns; + tlb::unpack(cs, dns); + ton::WorkchainId wc; + ton::StdSmcAddress addr; + if (!block::tlb::t_MsgAddressInt.extract_std_address(dns.resolver, wc, addr)) { + return td::Status::Error("Invalid address"); + } + return EntryData::next_resolver(block::StdAddress(wc, addr)); + } + case block::gen::DNSRecord::dns_adnl_address: { + block::gen::DNSRecord::Record_dns_adnl_address dns; + tlb::unpack(cs, dns); + return EntryData::adnl_address(dns.adnl_addr); + } + case block::gen::DNSRecord::dns_smc_address: { + block::gen::DNSRecord::Record_dns_smc_address dns; + tlb::unpack(cs, dns); + ton::WorkchainId wc; + ton::StdSmcAddress addr; + if (!block::tlb::t_MsgAddressInt.extract_std_address(dns.smc_addr, wc, addr)) { + return td::Status::Error("Invalid address"); + } + return EntryData::smc_address(block::StdAddress(wc, addr)); + } + } + return td::Status::Error("Unknown entry data"); +} + +SmartContract::Args DnsInterface::resolve_args_raw(td::Slice encoded_name, td::int16 category) { + SmartContract::Args res; + res.set_method_id("dnsresolve"); + res.set_stack( + {vm::load_cell_slice_ref(vm::CellBuilder().store_bytes(encoded_name).finalize()), td::make_refint(category)}); + return res; +} + +td::Result DnsInterface::resolve_args(td::Slice name, td::int32 category_big) { + TRY_RESULT(category, td::narrow_cast_safe(category_big)); + if (name.size() > get_default_max_name_size()) { + return td::Status::Error("Name is too long"); + } + auto encoded_name = encode_name(name); + return resolve_args_raw(encoded_name, category); +} + +td::Result> DnsInterface::resolve(td::Slice name, td::int32 category) const { + TRY_RESULT(raw_entries, resolve_raw(name, category)); + std::vector entries; + entries.reserve(raw_entries.size()); + for (auto& raw_entry : raw_entries) { + Entry entry; + entry.name = std::move(raw_entry.name); + entry.category = raw_entry.category; + auto cs = vm::load_cell_slice(raw_entry.data); + TRY_RESULT(data, EntryData::from_cellslice(cs)); + entry.data = std::move(data); + entries.push_back(std::move(entry)); + } + return entries; +} + +/* + External message structure: + [Bytes<512b>:signature] [UInt<32b>:seqno] [UInt<6b>:operation] + [Either b0: inline name (<= 58-x Bytes) or b1: reference-stored name) + x depends on operation + Use of 6-bit op instead of 32-bit allows to save 4 bytes for inline name + Inline [Name] structure: [UInt<6b>:length] [Bytes:data] + Operations (continuation of message): + 00 Contract initialization message (only if seqno = 0) (x=-) + 31 TSet: replace ENTIRE DOMAIN TABLE with the provided tree root cell (x=-) + [Cell<1r>:new_domains_table] + 51 OSet: replace owner public key with a new one (x=-) + [UInt<256b>:new_public_key] +*/ +// creation +td::Ref ManualDns::create(td::Ref data, int revision) { + return td::Ref( + true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::ManualDns, revision), std::move(data)}); +} + +td::Ref ManualDns::create(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, int revision) { + return create(create_init_data_fast(public_key, wallet_id), revision); +} + +td::optional ManualDns::guess_revision(const vm::Cell::Hash& code_hash) { + for (auto i : ton::SmartContractCode::get_revisions(ton::SmartContractCode::ManualDns)) { + if (ton::SmartContractCode::get_code(ton::SmartContractCode::ManualDns, i)->get_hash() == code_hash) { + return i; + } + } + return {}; +} +td::optional ManualDns::guess_revision(const block::StdAddress& address, + const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) { + for (auto i : {-1, 1}) { + auto dns = ton::ManualDns::create(public_key, wallet_id, i); + if (dns->get_address() == address) { + return i; + } + } + return {}; +} + +td::Result ManualDns::get_wallet_id() const { + return TRY_VM(get_wallet_id_or_throw()); +} +td::Result ManualDns::get_wallet_id_or_throw() const { + if (state_.data.is_null()) { + return 0; + } + //FIXME use get method + return static_cast(vm::load_cell_slice(state_.data).fetch_ulong(32)); +} + +td::Result> ManualDns::create_set_value_unsigned(td::int16 category, td::Slice name, + td::Ref data) const { + //11 VSet: set specified value to specified subdomain->category (x=2) + //[Int<16b>:category] [Name:subdomain] [Cell<1r>:value] + vm::CellBuilder cb; + cb.store_long(11, 6); + if (name.size() <= 58 - 2) { + cb.store_long(category, 16); + cb.store_long(0, 1); + cb.store_long(name.size(), 6); + cb.store_bytes(name); + } else { + cb.store_long(category, 16); + cb.store_long(1, 1); + cb.store_ref(vm::CellBuilder().store_bytes(name).finalize()); + } + cb.store_maybe_ref(std::move(data)); + return cb.finalize(); +} +td::Result> ManualDns::create_delete_value_unsigned(td::int16 category, td::Slice name) const { + //12 VDel: delete specified subdomain->category (x=2) + //[Int<16b>:category] [Name:subdomain] + vm::CellBuilder cb; + cb.store_long(12, 6); + if (name.size() <= 58 - 2) { + cb.store_long(category, 16); + cb.store_long(0, 1); + cb.store_long(name.size(), 6); + cb.store_bytes(name); + } else { + cb.store_long(category, 16); + cb.store_long(1, 1); + cb.store_ref(vm::CellBuilder().store_bytes(name).finalize()); + } + return cb.finalize(); +} + +td::Result> ManualDns::create_delete_all_unsigned() const { + // 32 TDel: nullify ENTIRE DOMAIN TABLE (x=-) + vm::CellBuilder cb; + cb.store_long(32, 6); + return cb.finalize(); +} + +td::Result> ManualDns::create_set_all_unsigned(td::Span entries) const { + vm::PrefixDictionary pdict(1023); + for (auto& action : entries) { + auto name_key = encode_name(action.name); + int zero_cnt = 0; + for (auto c : name_key) { + if (c == 0) { + zero_cnt++; + } + } + auto new_name_key = vm::load_cell_slice(vm::CellBuilder().store_long(zero_cnt, 7).store_bytes(name_key).finalize()); + auto ptr = new_name_key.data_bits(); + auto ptr_size = new_name_key.size(); + auto o_dict = pdict.lookup(ptr, ptr_size); + td::Ref dict_root; + if (o_dict.not_null()) { + o_dict->prefetch_maybe_ref(dict_root); + } + vm::Dictionary dict(dict_root, 16); + if (!action.data.value().is_null()) { + auto key = dict.integer_key(td::make_refint(action.category), 16); + dict.set_ref(key.bits(), 16, action.data.value()); + } + pdict.set(ptr, ptr_size, dict.get_root()); + } + + vm::CellBuilder cb; + cb.store_long(31, 6); + + cb.store_maybe_ref(pdict.get_root_cell()); + + return cb.finalize(); +} + +//21 DSet: replace entire category dictionary of domain with provided (x=0) +//[Name:subdomain] [Cell<1r>:new_cat_table] +//22 DDel: delete entire category dictionary of specified domain (x=0) +//[Name:subdomain] +td::Result> ManualDns::create_delete_name_unsigned(td::Slice name) const { + vm::CellBuilder cb; + cb.store_long(22, 6); + if (name.size() <= 58) { + cb.store_long(0, 1); + cb.store_long(name.size(), 6); + cb.store_bytes(name); + } else { + cb.store_long(1, 1); + cb.store_ref(vm::CellBuilder().store_bytes(name).finalize()); + } + return cb.finalize(); +} +td::Result> ManualDns::create_set_name_unsigned(td::Slice name, td::Span entries) const { + vm::CellBuilder cb; + cb.store_long(21, 6); + if (name.size() <= 58) { + cb.store_long(0, 1); + cb.store_long(name.size(), 6); + cb.store_bytes(name); + } else { + cb.store_long(1, 1); + cb.store_ref(vm::CellBuilder().store_bytes(name).finalize()); + } + + vm::Dictionary dict(16); + + for (auto& action : entries) { + if (action.data.value().is_null()) { + continue; + } + auto key = dict.integer_key(td::make_refint(action.category), 16); + dict.set_ref(key.bits(), 16, action.data.value()); + } + cb.store_maybe_ref(dict.get_root_cell()); + + return cb.finalize(); +} + +td::Result> ManualDns::prepare(td::Ref data, td::uint32 valid_until) const { + TRY_RESULT(wallet_id, get_wallet_id()); + auto hash = data->get_hash().as_slice().substr(28, 4).str(); + + vm::CellBuilder cb; + cb.store_long(wallet_id, 32).store_long(valid_until, 32); + //cb.store_bytes(hash); + cb.store_long(td::Random::secure_uint32(), 32); + cb.append_cellslice(vm::load_cell_slice(data)); + return cb.finalize(); +} + +td::Result> ManualDns::sign(const td::Ed25519::PrivateKey& private_key, td::Ref data) { + auto signature = private_key.sign(data->get_hash().as_slice()).move_as_ok(); + vm::CellBuilder cb; + cb.store_bytes(signature.as_slice()); + cb.append_cellslice(vm::load_cell_slice(data)); + return cb.finalize(); +} + +td::Result> ManualDns::create_init_query(const td::Ed25519::PrivateKey& private_key, + td::uint32 valid_until) const { + vm::CellBuilder cb; + cb.store_long(0, 6); + + TRY_RESULT(prepared, prepare(cb.finalize(), valid_until)); + return sign(private_key, std::move(prepared)); +} + +td::Ref ManualDns::create_init_data_fast(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) { + vm::CellBuilder cb; + cb.store_long(wallet_id, 32).store_long(0, 64).store_bytes(public_key.as_octet_string()); + CHECK(cb.store_maybe_ref({})); + CHECK(cb.store_maybe_ref({})); + return cb.finalize(); +} + +size_t ManualDns::get_max_name_size() const { + return get_default_max_name_size(); +} + +td::Result> ManualDns::resolve_raw(td::Slice name, td::int32 category_big) const { + return TRY_VM(resolve_raw_or_throw(name, category_big)); +} +td::Result> ManualDns::resolve_raw_or_throw(td::Slice name, + td::int32 category_big) const { + TRY_RESULT(category, td::narrow_cast_safe(category_big)); + if (name.size() > get_max_name_size()) { + return td::Status::Error("Name is too long"); + } + auto encoded_name = encode_name(name); + auto res = run_get_method(resolve_args_raw(encoded_name, category)); + if (!res.success) { + return td::Status::Error("get method failed"); + } + std::vector vec; + auto data = res.stack.write().pop_maybe_cell(); + if (data.is_null()) { + return vec; + } + size_t prefix_size = res.stack.write().pop_smallint_range((int)encoded_name.size() * 8); + if (prefix_size % 8 != 0) { + return td::Status::Error("Prefix size is not divisible by 8"); + } + prefix_size /= 8; + if (prefix_size < encoded_name.size()) { + vec.push_back({decode_name(td::Slice(encoded_name).substr(0, prefix_size)), -1, data}); + } else { + if (category == 0) { + vm::Dictionary dict(std::move(data), 16); + dict.check_for_each([&](auto cs, auto x, auto y) { + td::BigInt256 cat; + cat.import_bits(x, y, true); + vec.push_back({name.str(), td::narrow_cast(cat.to_long()), cs->prefetch_ref()}); + return true; + }); + } else { + vec.push_back({name.str(), category, data}); + } + } + + return vec; +} + +td::Result> ManualDns::create_update_query(CombinedActions& combined) const { + if (combined.name.empty()) { + if (combined.actions.value().empty()) { + return create_delete_all_unsigned(); + } + return create_set_all_unsigned(combined.actions.value()); + } + if (combined.category == 0) { + if (!combined.actions) { + return create_delete_name_unsigned(encode_name(combined.name)); + } + return create_set_name_unsigned(encode_name(combined.name), combined.actions.value()); + } + CHECK(combined.actions.value().size() == 1); + auto& action = combined.actions.value()[0]; + if (action.data) { + return create_set_value_unsigned(action.category, encode_name(action.name), action.data.value()); + } else { + return create_delete_value_unsigned(action.category, encode_name(action.name)); + } +} + +td::Result> ManualDns::create_update_query(td::Ed25519::PrivateKey& pk, td::Span actions, + td::uint32 valid_until) const { + auto combined = combine_actions(actions); + std::vector> queries; + for (auto& c : combined) { + TRY_RESULT(q, create_update_query(c)); + queries.push_back(std::move(q)); + } + + td::Ref combined_query; + for (auto& query : td::reversed(queries)) { + if (combined_query.is_null()) { + combined_query = std::move(query); + } else { + auto next = vm::load_cell_slice(combined_query); + combined_query = vm::CellBuilder() + .append_cellslice(vm::load_cell_slice(query)) + .store_ref(vm::CellBuilder().append_cellslice(next).finalize()) + .finalize(); + } + } + + TRY_RESULT(prepared, prepare(std::move(combined_query), valid_until)); + return sign(pk, std::move(prepared)); +} + +std::string DnsInterface::encode_name(td::Slice name) { + std::string res; + while (!name.empty()) { + auto pos = name.rfind('.'); + if (pos == name.npos) { + res += name.str(); + name = td::Slice(); + } else { + res += name.substr(pos + 1).str(); + name.truncate(pos); + } + res += '\0'; + } + return res; +} + +std::string DnsInterface::decode_name(td::Slice name) { + std::string res; + if (!name.empty() && name.back() == 0) { + name.remove_suffix(1); + } + while (!name.empty()) { + auto pos = name.rfind('\0'); + if (!res.empty()) { + res += '.'; + } + if (pos == name.npos) { + res += name.str(); + name = td::Slice(); + } else { + res += name.substr(pos + 1).str(); + name.truncate(pos); + } + } + return res; +} + +std::string ManualDns::serialize_data(const EntryData& data) { + std::string res; + data.data.visit(td::overloaded([&](const ton::ManualDns::EntryDataText& text) { res = "UNSUPPORTED"; }, + [&](const ton::ManualDns::EntryDataNextResolver& resolver) { res = "UNSUPPORTED"; }, + [&](const ton::ManualDns::EntryDataAdnlAddress& adnl_address) { res = "UNSUPPORTED"; }, + [&](const ton::ManualDns::EntryDataSmcAddress& text) { res = "UNSUPPORTED"; })); + return res; +} + +td::Result> ManualDns::parse_data(td::Slice cmd) { + td::ConstParser parser(cmd); + parser.skip_whitespaces(); + auto type = parser.read_till(':'); + parser.skip(':'); + if (type == "TEXT") { + return ManualDns::EntryData::text(parser.read_all().str()); + } else if (type == "ADNL") { + TRY_RESULT(address, td::adnl_id_decode(parser.read_all())); + return ManualDns::EntryData::adnl_address(address); + } else if (type == "SMC") { + TRY_RESULT(address, block::StdAddress::parse(parser.read_all())); + return ManualDns::EntryData::smc_address(address); + } else if (type == "NEXT") { + TRY_RESULT(address, block::StdAddress::parse(parser.read_all())); + return ManualDns::EntryData::next_resolver(address); + } else if (parser.data() == "DELETED") { + return {}; + } + return td::Status::Error(PSLICE() << "Unknown entry type: " << type); +} + +td::Result ManualDns::parse_line(td::Slice cmd) { + // Cmd = + // set name category data | + // delete.name name | + // delete.all + // data = + // TEXT: | + // SMC: | + // NEXT: | + // ADNL: + // DELETED + td::ConstParser parser(cmd); + auto type = parser.read_word(); + if (type == "set") { + auto name = parser.read_word(); + auto category_str = parser.read_word(); + TRY_RESULT(category, td::to_integer_safe(category_str)); + TRY_RESULT(data, parse_data(parser.read_all())); + return ManualDns::ActionExt{name.str(), category, std::move(data)}; + } else if (type == "delete.name") { + auto name = parser.read_word(); + if (name.empty()) { + return td::Status::Error("name is empty"); + } + return ManualDns::ActionExt{name.str(), 0, {}}; + } else if (type == "delete.all") { + return ManualDns::ActionExt{"", 0, {}}; + } + return td::Status::Error(PSLICE() << "Unknown command: " << type); +} + +td::Result> ManualDns::parse(td::Slice cmd) { + auto lines = td::full_split(cmd, '\n'); + std::vector res; + res.reserve(lines.size()); + for (auto& line : lines) { + td::ConstParser parser(line); + parser.skip_whitespaces(); + if (parser.empty()) { + continue; + } + TRY_RESULT(action, parse_line(parser.read_all())); + res.push_back(std::move(action)); + } + return res; +} + +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.h b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.h new file mode 100644 index 0000000000..fbf12e74c7 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/ManualDns.h @@ -0,0 +1,335 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ +#pragma once +#include "td/utils/Variant.h" +#include "td/utils/Status.h" +#include "vm/cells/Cell.h" +#include "vm/cells/CellSlice.h" +#include "vm/cells/CellString.h" + +#include "smc-envelope/SmartContract.h" + +#include "Ed25519.h" + +#include + +namespace ton { +class DnsInterface { + public: + struct EntryDataText { + std::string text; + bool operator==(const EntryDataText& other) const { + return text == other.text; + } + }; + + struct EntryDataNextResolver { + block::StdAddress resolver; + bool operator==(const EntryDataNextResolver& other) const { + return resolver == other.resolver; + } + }; + + struct EntryDataAdnlAddress { + ton::Bits256 adnl_address; + // TODO: proto + bool operator==(const EntryDataAdnlAddress& other) const { + return adnl_address == other.adnl_address; + } + }; + + struct EntryDataSmcAddress { + block::StdAddress smc_address; + bool operator==(const EntryDataSmcAddress& other) const { + return smc_address == other.smc_address; + } + // TODO: capability + }; + + struct EntryData { + enum Type { Empty, Text, NextResolver, AdnlAddress, SmcAddress } type{Empty}; + td::Variant data; + + static EntryData text(std::string text) { + return {Text, EntryDataText{text}}; + } + static EntryData next_resolver(block::StdAddress resolver) { + return {NextResolver, EntryDataNextResolver{resolver}}; + } + static EntryData adnl_address(ton::Bits256 adnl_address) { + return {AdnlAddress, EntryDataAdnlAddress{adnl_address}}; + } + static EntryData smc_address(block::StdAddress smc_address) { + return {SmcAddress, EntryDataSmcAddress{smc_address}}; + } + + bool operator==(const EntryData& other) const { + return data == other.data; + } + friend td::StringBuilder& operator<<(td::StringBuilder& sb, const EntryData& data); + + td::Result> as_cell() const; + static td::Result from_cellslice(vm::CellSlice& cs); + }; + + struct Entry { + std::string name; + td::int16 category; + EntryData data; + auto key() const { + return std::tie(name, category); + } + bool operator<(const Entry& other) const { + return key() < other.key(); + } + bool operator==(const Entry& other) const { + return key() == other.key() && data == other.data; + } + friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Entry& entry) { + sb << entry.name << ":" << entry.category << ":" << entry.data; + return sb; + } + }; + struct RawEntry { + std::string name; + td::int16 category; + td::Ref data; + }; + + struct ActionExt { + std::string name; + td::int16 category; + td::optional data; + static td::Result parse(td::Slice); + }; + + struct Action { + std::string name; + td::int16 category; + td::optional> data; + + bool does_create_category() const { + CHECK(!name.empty()); + CHECK(category != 0); + return static_cast(data); + } + bool does_change_empty() const { + CHECK(!name.empty()); + CHECK(category != 0); + return static_cast(data) && data.value().not_null(); + } + void make_non_empty() { + CHECK(!name.empty()); + CHECK(category != 0); + if (!data) { + data = td::Ref(); + } + } + friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Action& action) { + sb << action.name << ":" << action.category << ":"; + if (action.data) { + if (action.data.value().is_null()) { + sb << ""; + } else { + sb << ""; + } + } else { + sb << ""; + } + return sb; + } + }; + + virtual ~DnsInterface() { + } + virtual size_t get_max_name_size() const = 0; + virtual td::Result> resolve_raw(td::Slice name, td::int32 category) const = 0; + virtual td::Result> create_update_query( + td::Ed25519::PrivateKey& pk, td::Span actions, + td::uint32 valid_until = std::numeric_limits::max()) const = 0; + + td::Result> resolve(td::Slice name, td::int32 category) const; + + static std::string encode_name(td::Slice name); + static std::string decode_name(td::Slice name); + + static size_t get_default_max_name_size() { + return 128; + } + static SmartContract::Args resolve_args_raw(td::Slice encoded_name, td::int16 category); + static td::Result resolve_args(td::Slice name, td::int32 category); +}; + +class ManualDns : public ton::SmartContract, public DnsInterface { + public: + ManualDns(State state) : SmartContract(std::move(state)) { + } + + ManualDns* make_copy() const override { + return new ManualDns{state_}; + } + + // creation + static td::Ref create(State state) { + return td::Ref(true, std::move(state)); + } + static td::Ref create(td::Ref data = {}, int revision = 0); + static td::Ref create(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, int revision = 0); + + static std::string serialize_data(const EntryData& data); + static td::Result> parse_data(td::Slice cmd); + static td::Result parse_line(td::Slice cmd); + static td::Result> parse(td::Slice cmd); + + static td::optional guess_revision(const vm::Cell::Hash& code_hash); + static td::optional guess_revision(const block::StdAddress& address, + const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id); + + td::Ref create_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 valid_until) const { + return create_init_data_fast(public_key, valid_until); + } + + td::Result get_wallet_id() const; + td::Result get_wallet_id_or_throw() const; + + td::Result> create_set_value_unsigned(td::int16 category, td::Slice name, + td::Ref data) const; + td::Result> create_delete_value_unsigned(td::int16 category, td::Slice name) const; + td::Result> create_delete_all_unsigned() const; + td::Result> create_set_all_unsigned(td::Span entries) const; + td::Result> create_delete_name_unsigned(td::Slice name) const; + td::Result> create_set_name_unsigned(td::Slice name, td::Span entries) const; + + td::Result> prepare(td::Ref data, td::uint32 valid_until) const; + + static td::Result> sign(const td::Ed25519::PrivateKey& private_key, td::Ref data); + static td::Ref create_init_data_fast(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id); + + size_t get_max_name_size() const override; + td::Result> resolve_raw(td::Slice name, td::int32 category_big) const override; + td::Result> resolve_raw_or_throw(td::Slice name, td::int32 category_big) const; + + td::Result> create_init_query( + const td::Ed25519::PrivateKey& private_key, + td::uint32 valid_until = std::numeric_limits::max()) const; + td::Result> create_update_query( + td::Ed25519::PrivateKey& pk, td::Span actions, + td::uint32 valid_until = std::numeric_limits::max()) const override; + + template + struct CombinedActions { + std::string name; + td::int16 category{0}; + td::optional> actions; + friend td::StringBuilder& operator<<(td::StringBuilder& sb, const CombinedActions& action) { + sb << action.name << ":" << action.category << ":"; + if (action.actions) { + sb << "" << action.actions.value().size(); + } else { + sb << ""; + } + return sb; + } + }; + + template + static std::vector> combine_actions(td::Span actions) { + struct Info { + std::set known_category; + std::vector actions; + bool closed{false}; + bool non_empty{false}; + }; + + std::map mp; + std::vector> res; + for (auto& action : td::reversed(actions)) { + if (action.name.empty()) { + CombinedActions set_all; + set_all.actions = std::vector(); + for (auto& it : mp) { + for (auto& e : it.second.actions) { + if (e.does_create_category()) { + set_all.actions.value().push_back(std::move(e)); + } + } + } + res.push_back(std::move(set_all)); + return res; + } + + Info& info = mp[action.name]; + if (info.closed) { + continue; + } + if (action.category != 0 && action.does_create_category()) { + info.non_empty = true; + } + if (!info.known_category.insert(action.category).second) { + continue; + } + if (action.category == 0) { + info.closed = true; + auto old_actions = std::move(info.actions); + bool is_empty = true; + for (auto& action : old_actions) { + if (is_empty && action.does_create_category()) { + info.actions.push_back(std::move(action)); + is_empty = false; + } else if (!is_empty && action.does_change_empty()) { + info.actions.push_back(std::move(action)); + } + } + } else { + info.actions.push_back(std::move(action)); + } + } + + for (auto& it : mp) { + auto& info = it.second; + if (info.closed) { + CombinedActions ca; + ca.name = it.first; + ca.category = 0; + if (!info.actions.empty() || info.non_empty) { + ca.actions = std::move(info.actions); + } + res.push_back(std::move(ca)); + } else { + bool need_non_empty = info.non_empty; + for (auto& a : info.actions) { + if (need_non_empty) { + a.make_non_empty(); + need_non_empty = false; + } + CombinedActions ca; + ca.name = a.name; + ca.category = a.category; + ca.actions = std::vector(); + ca.actions.value().push_back(std::move(a)); + res.push_back(ca); + } + } + } + return res; + } + td::Result> create_update_query(CombinedActions& combined) const; +}; + +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp index 36830179c5..5a9fab6a82 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.cpp @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ #include "MultisigWallet.h" #include "SmartContractCode.h" @@ -8,8 +26,13 @@ namespace ton { -MultisigWallet::QueryBuilder::QueryBuilder(td::int64 query_id, td::Ref msg, int mode) { - msg_ = vm::CellBuilder().store_long(query_id, 64).store_long(mode, 8).store_ref(std::move(msg)).finalize(); +MultisigWallet::QueryBuilder::QueryBuilder(td::uint32 wallet_id, td::int64 query_id, td::Ref msg, int mode) { + msg_ = vm::CellBuilder() + .store_long(wallet_id, 32) + .store_long(query_id, 64) + .store_long(mode, 8) + .store_ref(std::move(msg)) + .finalize(); } void MultisigWallet::QueryBuilder::sign(td::int32 id, td::Ed25519::PrivateKey& pk) { CHECK(id < td::narrow_cast(mask_.size())); @@ -43,7 +66,8 @@ td::Ref MultisigWallet::QueryBuilder::create(td::int32 id, td::Ed25519 } td::Ref MultisigWallet::create(td::Ref data) { - return td::Ref(true, State{ton::SmartContractCode::multisig(), std::move(data)}); + return td::Ref( + true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::Multisig), std::move(data)}); } int MultisigWallet::processed(td::uint64 query_id) const { @@ -87,26 +111,29 @@ std::vector MultisigWallet::get_public_keys() const { return res; } -td::Ref MultisigWallet::create_init_data(std::vector public_keys, int k) const { +td::Ref MultisigWallet::create_init_data(td::uint32 wallet_id, std::vector public_keys, + int k) const { vm::Dictionary pk(8); for (size_t i = 0; i < public_keys.size(); i++) { auto key = pk.integer_key(td::make_refint(i), 8, false); - pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice())); + pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice()).store_long(0, 8)); } - auto res = run_get_method("create_init_state", - {td::make_refint(public_keys.size()), td::make_refint(k), pk.get_root_cell()}); + auto res = run_get_method("create_init_state", {td::make_refint(wallet_id), td::make_refint(public_keys.size()), + td::make_refint(k), pk.get_root_cell()}); CHECK(res.code == 0); return res.stack.write().pop_cell(); } -td::Ref MultisigWallet::create_init_data_fast(std::vector public_keys, int k) { +td::Ref MultisigWallet::create_init_data_fast(td::uint32 wallet_id, std::vector public_keys, + int k) { vm::Dictionary pk(8); for (size_t i = 0; i < public_keys.size(); i++) { auto key = pk.integer_key(td::make_refint(i), 8, false); - pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice())); + pk.set_builder(key.bits(), 8, vm::CellBuilder().store_bytes(public_keys[i].as_slice()).store_long(0, 8)); } vm::CellBuilder cb; + cb.store_long(wallet_id, 32); cb.store_long(public_keys.size(), 8).store_long(k, 8).store_long(0, 64); cb.ensure_throw(cb.store_maybe_ref(pk.get_root_cell())); cb.ensure_throw(cb.store_maybe_ref({})); @@ -156,7 +183,7 @@ std::vector MultisigWallet::get_unsigned_messaged(int i vm::Dictionary dict(std::move(cell), 64); std::vector res; dict.check_for_each([&](auto cs, auto ptr, auto ptr_bits) { - cs.write().skip_first(8); + cs.write().skip_first(8 + 8); Message message; td::BigInt256 query_id; query_id.import_bits(ptr, ptr_bits, false); diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h index 10c6d07604..96da297a4f 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/MultisigWallet.h @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ #pragma once #include "vm/cells.h" @@ -20,7 +38,7 @@ class MultisigWallet : public ton::SmartContract { class QueryBuilder { public: - QueryBuilder(td::int64 query_id, td::Ref msg, int mode = 3); + QueryBuilder(td::uint32 wallet_id, td::int64 query_id, td::Ref msg, int mode = 3); void sign(td::int32 id, td::Ed25519::PrivateKey& pk); td::Ref create_inner() const; @@ -42,8 +60,9 @@ class MultisigWallet : public ton::SmartContract { // creation static td::Ref create(td::Ref data = {}); - td::Ref create_init_data(std::vector public_keys, int k) const; - static td::Ref create_init_data_fast(std::vector public_keys, int k); + td::Ref create_init_data(td::uint32 wallet_id, std::vector public_keys, int k) const; + static td::Ref create_init_data_fast(td::uint32 wallet_id, std::vector public_keys, + int k); // get methods int processed(td::uint64 query_id) const; diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp index ea76423763..36ba273043 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "SmartContract.h" @@ -24,23 +24,21 @@ #include "block/block-auto.h" #include "vm/cellslice.h" #include "vm/cp0.h" -#include "vm/continuation.h" +#include "vm/memo.h" +#include "vm/vm.h" #include "td/utils/crypto.h" namespace ton { namespace { -td::int32 get_method_id(td::Slice method_name) { - unsigned crc = td::crc16(method_name); - return (crc & 0xffff) | 0x10000; -} + td::Ref prepare_vm_stack(td::Ref body) { td::Ref stack_ref{true}; td::RefInt256 acc_addr{true}; //CHECK(acc_addr.write().import_bits(account.addr.cbits(), 256)); vm::Stack& stack = stack_ref.write(); - stack.push_int(td::RefInt256{true, 10000000000}); - stack.push_int(td::RefInt256{true, 10000000000}); + stack.push_int(td::make_refint(10000000000)); + stack.push_int(td::make_refint(10000000000)); stack.push_cell(vm::CellBuilder().finalize()); stack.push_cellslice(std::move(body)); return stack_ref; @@ -94,6 +92,11 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref= VERBOSITY_NAME(DEBUG)) { + std::ostringstream os; + stack->dump(os, 2); + LOG(DEBUG) << "VM stack:\n" << os.str(); + } 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); @@ -111,7 +114,7 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref= 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; @@ -128,6 +131,21 @@ SmartContract::Answer run_smartcont(SmartContract::State state, td::Ref SmartContract::Args::get_serialized_stack() { + if (!stack) { + return td::Status::Error("Args has no stack"); + } + vm::FakeVmStateLimits fstate(1000); // limit recursive (de)serialization calls + vm::VmStateInterface::Guard guard(&fstate); + // serialize parameters + vm::CellBuilder cb; + td::Ref cell; + if (!(stack.value()->serialize(cb) && cb.finalize_to(cell))) { + return td::Status::Error("Cannot serialize stack in args"); + } + return vm::std_boc_serialize(std::move(cell)); +} + td::Ref SmartContract::empty_slice() { return vm::load_cell_slice_ref(vm::CellBuilder().finalize()); } diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h index d586436195..24c2d13232 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContract.h @@ -14,13 +14,13 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "vm/cells.h" #include "vm/stack.hpp" -#include "vm/continuation.h" +#include "vm/vm.h" #include "td/utils/optional.h" #include "td/utils/crypto.h" @@ -90,6 +90,14 @@ class SmartContract : public td::CntObject { this->ignore_chksig = ignore_chksig; return std::move(*this); } + + td::Result get_method_id() const { + if (!method_id) { + return td::Status::Error("Args has no method id"); + } + return method_id.value(); + } + td::Result get_serialized_stack(); }; Answer run_method(Args args = {}); diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp index c187131d71..6256dcc064 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "SmartContractCode.h" @@ -25,13 +25,15 @@ namespace ton { namespace { +// WALLET_REVISION = 2; +// WALLET2_REVISION = 2; +// WALLET3_REVISION = 2; +// HIGHLOAD_WALLET_REVISION = 2; +// HIGHLOAD_WALLET2_REVISION = 2; +// DNS_REVISION = 1; const auto& get_map() { static auto map = [] { - class Cmp : public std::less<> { - public: - using is_transparent = void; - }; - std::map, Cmp> map; + std::map, std::less<>> map; auto with_tvm_code = [&](auto name, td::Slice code_str) { map[name] = vm::std_boc_deserialize(td::base64_decode(code_str).move_as_ok()).move_as_ok(); }; @@ -39,6 +41,61 @@ 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" +#include "smartcont/auto/highload-wallet-v2-code.cpp" +#include "smartcont/auto/dns-manual-code.cpp" + + with_tvm_code("highload-wallet-r1", + "te6ccgEBBgEAhgABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQC88oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/" + "0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhghgBD0eG+hb6EgmALTB9QwAfsAkTLiAbPmWwGkyMsfyx/L/" + "8ntVAAE0DAAEaCZL9qJoa4WPw=="); + with_tvm_code("highload-wallet-r2", + "te6ccgEBCAEAlwABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQC48oMI1xgg0x/TH9Mf+CMTu/Jj7UTQ0x/TH9P/" + "0VEyuvKhUUS68qIE+QFUEFX5EPKj9ATR+AB/jhYhgBD0eG+lIJgC0wfUMAH7AJEy4gGz5lsBpMjLH8sfy//" + "J7VQABNAwAgFIBgcAF7s5ztRNDTPzHXC/+AARuMl+1E0NcLH4"); + with_tvm_code("highload-wallet-v2-r1", + "te6ccgEBBwEA1gABFP8A9KQT9KDyyAsBAgEgAgMCAUgEBQHu8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//" + "QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44YIYAQ9HhvoW+" + "hIJgC0wfUMAH7AJEy4gGz5luDJaHIQDSAQPRDiuYxyBLLHxPLP8v/9ADJ7VQGAATQMABBoZfl2omhpj5jpn+n/" + "mPoCaKkQQCB6BzfQmMktv8ld0fFADgggED0lm+hb6EyURCUMFMDud4gkzM2AZIyMOKz"); + with_tvm_code("highload-wallet-v2-r2", + "te6ccgEBCQEA5QABFP8A9KQT9LzyyAsBAgEgAgMCAUgEBQHq8oMI1xgg0x/TP/gjqh9TILnyY+1E0NMf0z/T//" + "QE0VNggED0Dm+hMfJgUXO68qIH+QFUEIf5EPKjAvQE0fgAf44WIYAQ9HhvpSCYAtMH1DAB+wCRMuIBs+" + "ZbgyWhyEA0gED0Q4rmMcgSyx8Tyz/L//QAye1UCAAE0DACASAGBwAXvZznaiaGmvmOuF/8AEG+X5dqJoaY+Y6Z/p/" + "5j6AmipEEAgegc30JjJLb/JXdHxQANCCAQPSWb6UyURCUMFMDud4gkzM2AZIyMOKz"); + with_tvm_code("simple-wallet-r1", + "te6ccgEEAQEAAAAAUwAAov8AIN0gggFMl7qXMO1E0NcLH+Ck8mCBAgDXGCDXCx/tRNDTH9P/" + "0VESuvKhIvkBVBBE+RDyovgAAdMfMSDXSpbTB9QC+wDe0aTIyx/L/8ntVA=="); + with_tvm_code("simple-wallet-r2", + "te6ccgEBAQEAXwAAuv8AIN0gggFMl7ohggEznLqxnHGw7UTQ0x/XC//jBOCk8mCBAgDXGCDXCx/tRNDTH9P/" + "0VESuvKhIvkBVBBE+RDyovgAAdMfMSDXSpbTB9QC+wDe0aTIyx/L/8ntVA=="); + with_tvm_code("wallet-r1", + "te6ccgEBAQEAVwAAqv8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x8B+CO78mPtRNDTH9P/0VExuvKhA/" + "kBVBBC+RDyovgAApMg10qW0wfUAvsA6NGkyMsfy//J7VQ="); + with_tvm_code("wallet-r2", + "te6ccgEBAQEAYwAAwv8AIN0gggFMl7ohggEznLqxnHGw7UTQ0x/XC//jBOCk8mCDCNcYINMf0x8B+CO78mPtRNDTH9P/" + "0VExuvKhA/kBVBBC+RDyovgAApMg10qW0wfUAvsA6NGkyMsfy//J7VQ="); + with_tvm_code("wallet3-r1", + "te6ccgEBAQEAYgAAwP8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/" + "9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA=="); + with_tvm_code("wallet3-r2", + "te6ccgEBAQEAcQAA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/" + "T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA=="); + with_tvm_code( + "dns-manual-r1", + "te6ccgECGAEAAtAAART/APSkE/S88sgLAQIBIAIDAgFIBAUC7PLbPAWDCNcYIPkBAdMf0z/" + "4I6ofUyC58mNTKoBA9A5voTHyYFKUuvKiVBNG+RDyo/gAItcLBcAzmDQBdtch0/" + "8wjoVa2zxAA+" + "IDgyWhyEAHgED0Q44aIIBA9JZvpTJREJQwUwe53iCTMzUBkjIw4rPmNVUD8AQREgICxQYHAgEgDA0CAc8ICQAIqoJfAwIBSAoLACHWQK5Y+" + "J5Z/l//oAegBk9qpAAFF8DgABcyPQAydBBM/Rw8qGAAF72c52omhpr5jrhf/" + "AIBIA4PABG7Nz7UTQ1wsfgD+" + "7owwh10kglF8DcG3hIHew8l4ieNci1wsHnnDIUATPFhPLB8nQAqYI3iDACJRfA3Bt4Ns8FF8EI3ADqwKY0wcBwAAToQLkIG2OnF8DIcjLBiTPF" + "snQhAlUQgHbPAWlFbIgwQEVQzDmMzUilF8FcG3hMgHHAJMxfwHfAtdJpvmBEVEAAYIcAAkjEB4AKAEPRqABztRNDTH9M/0//" + "0BPQE0QE2cFmOlNs8IMcBnCDXSpPUMNCTMn8C4t4i5jAxEwT20wUhwQqOLCGRMeEhwAGXMdMH1AL7AOABwAmOFNQh+wTtQwLQ7R7tU1RiA/" + "EGgvIA4PIt4HAiwRSUMNIPAd5tbSTBHoreJMEUjpElhAkj2zwzApUyxwDyo5Fb4t4kwAuOEzQC9ARQJIAQ9G4wECOECVnwAQHgJMAMiuAwFBUW" + "FwCEMQLTAAHAAZPUAdCY0wUBqgLXGAHiINdJwg/" + "ypiB41yLXCwfyaHBTEddJqTYCmNMHAcAAEqEB5DDIywYBzxbJ0FADACBZ9KhvpSCUAvQEMJIybeICACg0A4AQ9FqZECOECUBE8AEBkjAx4gBmM" + "SLAFZwy9AQQI4QJUELwAQHgIsAWmDIChAn0czAB4DAyIMAfkzD0BODAIJJtAeDyLG0B"); return map; }(); return map; @@ -49,24 +106,97 @@ td::Result> SmartContractCode::load(td::Slice name) { auto& map = get_map(); auto it = map.find(name); if (it == map.end()) { - return td::Status::Error(PSLICE() << "Can't load td::ref " << name); } return it->second; } -td::Ref SmartContractCode::multisig() { - auto res = load("multisig").move_as_ok(); - return res; + +td::Span SmartContractCode::get_revisions(Type type) { + switch (type) { + case Type::WalletV1: { + static int res[] = {1, 2}; + return res; + } + case Type::WalletV2: { + static int res[] = {1, 2}; + return res; + } + case Type::WalletV3: { + static int res[] = {1, 2}; + return res; + } + case Type::WalletV1Ext: { + static int res[] = {-1}; + return res; + } + case Type::HighloadWalletV1: { + static int res[] = {-1, 1, 2}; + return res; + } + case Type::HighloadWalletV2: { + static int res[] = {-1, 1, 2}; + return res; + } + case Type::Multisig: { + static int res[] = {-1}; + return res; + } + case Type::ManualDns: { + static int res[] = {-1, 1}; + return res; + } + } + UNREACHABLE(); + return {}; } -td::Ref SmartContractCode::wallet() { - auto res = load("wallet").move_as_ok(); - return res; + +td::Result SmartContractCode::validate_revision(Type type, int revision) { + auto revisions = get_revisions(type); + if (revision == -1) { + if (revisions[0] == -1) { + return -1; + } + return revisions[revisions.size() - 1]; + } + if (revision == 0) { + return revisions[revisions.size() - 1]; + } + for (auto x : revisions) { + if (x == revision) { + return revision; + } + } + return td::Status::Error("No such revision"); } -td::Ref SmartContractCode::simple_wallet() { - auto res = load("simple-wallet").move_as_ok(); - return res; -} -td::Ref SmartContractCode::simple_wallet_ext() { - static auto res = load("simple-wallet-ext").move_as_ok(); - return res; + +td::Ref SmartContractCode::get_code(Type type, int ext_revision) { + auto revision = validate_revision(type, ext_revision).move_as_ok(); + auto basename = [](Type type) -> td::Slice { + switch (type) { + case Type::WalletV1: + return "simple-wallet"; + case Type::WalletV2: + return "wallet"; + case Type::WalletV3: + return "wallet3"; + case Type::WalletV1Ext: + return "simple-wallet-ext"; + case Type::HighloadWalletV1: + return "highload-wallet"; + case Type::HighloadWalletV2: + return "highload-wallet-v2"; + case Type::Multisig: + return "multisig"; + case Type::ManualDns: + return "dns-manual"; + } + UNREACHABLE(); + return ""; + }(type); + if (revision == -1) { + return load(basename).move_as_ok(); + } + return load(PSLICE() << basename << "-r" << revision).move_as_ok(); } + } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h index 059215e445..1ea2274c84 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/SmartContractCode.h @@ -14,17 +14,20 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/cells.h" +#include "td/utils/Span.h" + namespace ton { class SmartContractCode { public: static td::Result> load(td::Slice name); - static td::Ref multisig(); - static td::Ref wallet(); - static td::Ref simple_wallet(); - static td::Ref simple_wallet_ext(); + + enum Type { WalletV1 = 1, WalletV1Ext, WalletV2, WalletV3, HighloadWalletV1, HighloadWalletV2, ManualDns, Multisig }; + static td::Span get_revisions(Type type); + static td::Result validate_revision(Type type, int revision); + static td::Ref get_code(Type type, int revision = 0); }; } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp index 2d44d73073..f9ed60bfd7 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "TestGiver.h" #include "GenericAccount.h" @@ -35,14 +35,23 @@ vm::CellHash TestGiver::get_init_code_hash() noexcept { //return vm::CellHash::from_slice(td::base64_decode("YV/IANhoI22HVeatFh6S5LbCHp+5OilARfzW+VQPZgQ=").move_as_ok()); } -td::Ref TestGiver::make_a_gift_message(td::uint32 seqno, td::uint64 gramms, td::Slice message, - const block::StdAddress& dest_address) noexcept { +td::Ref TestGiver::make_a_gift_message_static(td::uint32 seqno, td::Span gifts) noexcept { + CHECK(gifts.size() <= max_gifts_size); + vm::CellBuilder cb; - GenericAccount::store_int_message(cb, dest_address, gramms); - cb.store_bytes("\0\0\0\0", 4); - vm::CellString::store(cb, message, 35 * 8).ensure(); - auto message_inner = cb.finalize(); - return vm::CellBuilder().store_long(seqno, 32).store_long(1, 8).store_ref(message_inner).finalize(); + cb.store_long(seqno, 32); + + for (auto& gift : gifts) { + td::int32 send_mode = 1; + auto gramms = gift.gramms; + vm::CellBuilder cbi; + GenericAccount::store_int_message(cbi, gift.destination, gramms); + store_gift_message(cbi, gift); + auto message_inner = cbi.finalize(); + cb.store_long(send_mode, 8).store_ref(std::move(message_inner)); + } + + return cb.finalize(); } td::Result TestGiver::get_seqno() const { diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h index 210b691240..b51ac7dbe0 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestGiver.h @@ -14,25 +14,38 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "SmartContract.h" +#include "smc-envelope/WalletInterface.h" #include "block/block.h" #include "vm/cells/CellString.h" namespace ton { -class TestGiver : public SmartContract { +class TestGiver : public SmartContract, public WalletInterface { public: explicit TestGiver(State state) : ton::SmartContract(std::move(state)) { } + TestGiver() : ton::SmartContract({}) { + } static constexpr unsigned max_message_size = vm::CellString::max_bytes; + static constexpr unsigned max_gifts_size = 1; static const block::StdAddress& address() noexcept; static vm::CellHash get_init_code_hash() noexcept; - static td::Ref make_a_gift_message(td::uint32 seqno, td::uint64 gramms, td::Slice message, - const block::StdAddress& dest_address) noexcept; + static td::Ref make_a_gift_message_static(td::uint32 seqno, td::Span) noexcept; td::Result get_seqno() const; + using WalletInterface::get_init_message; + td::Result> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until, + td::Span gifts) const override { + TRY_RESULT(seqno, get_seqno()); + return make_a_gift_message_static(seqno, gifts); + } + size_t get_max_gifts_size() const override { + return max_gifts_size; + } + private: td::Result get_seqno_or_throw() const; }; diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp index 1edf59f911..4f4dcd8dc2 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.cpp @@ -13,17 +13,19 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . -Copyright 2017-2019 Telegram Systems LLP +Copyright 2017-2020 Telegram Systems LLP */ #include "TestWallet.h" #include "GenericAccount.h" +#include "SmartContractCode.h" + #include "vm/boc.h" #include "td/utils/base64.h" namespace ton { -td::Ref TestWallet::get_init_state(const td::Ed25519::PublicKey& public_key) noexcept { - auto code = get_init_code(); +td::Ref TestWallet::get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision) noexcept { + auto code = get_init_code(revision); auto data = get_init_data(public_key); return GenericAccount::get_init_state(std::move(code), std::move(data)); } @@ -35,42 +37,46 @@ td::Ref TestWallet::get_init_message(const td::Ed25519::PrivateKey& pr return vm::CellBuilder().store_bytes(signature).store_bytes(seq_no).finalize(); } -td::Ref TestWallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno, - td::int64 gramms, td::Slice message, - const block::StdAddress& dest_address) noexcept { - td::int32 send_mode = 3; - if (gramms == -1) { - gramms = 0; - send_mode += 128; - } +td::Ref TestWallet::make_a_gift_message_static(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno, + td::Span gifts) noexcept { + CHECK(gifts.size() <= max_gifts_size); + vm::CellBuilder cb; - GenericAccount::store_int_message(cb, dest_address, gramms); - cb.store_bytes("\0\0\0\0", 4); - vm::CellString::store(cb, message, 35 * 8).ensure(); - auto message_inner = cb.finalize(); - auto message_outer = - vm::CellBuilder().store_long(seqno, 32).store_long(send_mode, 8).store_ref(message_inner).finalize(); + cb.store_long(seqno, 32); + + for (auto& gift : gifts) { + td::int32 send_mode = 3; + auto gramms = gift.gramms; + if (gramms == -1) { + gramms = 0; + send_mode += 128; + } + vm::CellBuilder cbi; + GenericAccount::store_int_message(cbi, gift.destination, gramms); + store_gift_message(cbi, gift); + auto message_inner = cbi.finalize(); + cb.store_long(send_mode, 8).store_ref(std::move(message_inner)); + } + + 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 TestWallet::get_init_code() noexcept { - static auto res = [] { - auto serialized_code = td::base64_decode( - "te6ccgEEAQEAAAAAUwAAov8AIN0gggFMl7qXMO1E0NcLH+Ck8mCBAgDXGCDXCx/tRNDTH9P/" - "0VESuvKhIvkBVBBE+RDyovgAAdMfMSDXSpbTB9QC+wDe0aTIyx/L/8ntVA==") - .move_as_ok(); - return vm::std_boc_deserialize(serialized_code).move_as_ok(); - }(); - return res; +td::Ref TestWallet::get_init_code(td::int32 revision) noexcept { + return ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1, revision); } vm::CellHash TestWallet::get_init_code_hash() noexcept { return get_init_code()->get_hash(); } +td::Ref TestWallet::get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept { + return vm::CellBuilder().store_long(seqno, 32).store_bytes(public_key.as_octet_string()).finalize(); +} + td::Ref TestWallet::get_init_data(const td::Ed25519::PublicKey& public_key) noexcept { - return vm::CellBuilder().store_long(0, 32).store_bytes(public_key.as_octet_string()).finalize(); + return get_data(public_key, 0); } td::Result TestWallet::get_seqno() const { @@ -88,4 +94,20 @@ td::Result TestWallet::get_seqno_or_throw() const { return static_cast(seqno); } +td::Result TestWallet::get_public_key() const { + return TRY_VM(get_public_key_or_throw()); +} + +td::Result TestWallet::get_public_key_or_throw() const { + if (state_.data.is_null()) { + return td::Status::Error("data is null"); + } + //FIXME use get method + auto cs = vm::load_cell_slice(state_.data); + cs.skip_first(32); + td::SecureString res(td::Ed25519::PublicKey::LENGTH); + cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast(res.size())); + return td::Ed25519::PublicKey(std::move(res)); +} + } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h index 161aef58b5..46891aa961 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/TestWallet.h @@ -14,35 +14,53 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "smc-envelope/SmartContract.h" +#include "smc-envelope/WalletInterface.h" #include "vm/cells.h" #include "Ed25519.h" #include "block/block.h" #include "vm/cells/CellString.h" namespace ton { -class TestWallet : public ton::SmartContract { +class TestWallet : public ton::SmartContract, public WalletInterface { public: explicit TestWallet(State state) : ton::SmartContract(std::move(state)) { } + explicit TestWallet(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) + : TestWallet(State{get_init_code(), get_data(public_key, seqno)}) { + } static constexpr unsigned max_message_size = vm::CellString::max_bytes; - static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key) noexcept; + static constexpr unsigned max_gifts_size = 1; + static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision = 0) noexcept; static td::Ref get_init_message(const td::Ed25519::PrivateKey& private_key) noexcept; - static td::Ref make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno, - td::int64 gramms, td::Slice message, - const block::StdAddress& dest_address) noexcept; + static td::Ref make_a_gift_message_static(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno, + td::Span gifts) noexcept; - static td::Ref get_init_code() noexcept; + static td::Ref get_init_code(td::int32 revision = 0) noexcept; static vm::CellHash get_init_code_hash() noexcept; + static td::Ref get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept; static td::Ref get_init_data(const td::Ed25519::PublicKey& public_key) noexcept; td::Result get_seqno() const; + using WalletInterface::get_init_message; + td::Result> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until, + td::Span gifts) const override { + TRY_RESULT(seqno, get_seqno()); + return make_a_gift_message_static(private_key, seqno, gifts); + } + size_t get_max_gifts_size() const override { + return max_gifts_size; + } + + td::Result get_public_key() const override; + private: td::Result get_seqno_or_throw() const; + td::Result get_public_key_or_throw() const; }; } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp index 61958ed959..ef637fb96c 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.cpp @@ -14,10 +14,11 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "Wallet.h" #include "GenericAccount.h" +#include "SmartContractCode.h" #include "vm/boc.h" #include "vm/cells/CellString.h" @@ -26,8 +27,8 @@ #include namespace ton { -td::Ref Wallet::get_init_state(const td::Ed25519::PublicKey& public_key) noexcept { - auto code = get_init_code(); +td::Ref Wallet::get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision) noexcept { + auto code = get_init_code(revision); auto data = get_init_data(public_key); return GenericAccount::get_init_state(std::move(code), std::move(data)); } @@ -43,46 +44,45 @@ td::Ref Wallet::get_init_message(const td::Ed25519::PrivateKey& privat } td::Ref Wallet::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno, - td::uint32 valid_until, td::int64 gramms, td::Slice message, - const block::StdAddress& dest_address) noexcept { - td::int32 send_mode = 3; - if (gramms == -1) { - gramms = 0; - send_mode += 128; - } - vm::CellBuilder cb; - GenericAccount::store_int_message(cb, dest_address, gramms); - cb.store_bytes("\0\0\0\0", 4); - vm::CellString::store(cb, message, 35 * 8).ensure(); - auto message_inner = cb.finalize(); + td::uint32 valid_until, td::Span gifts) noexcept { + CHECK(gifts.size() <= max_gifts_size); - auto message_outer = vm::CellBuilder() - .store_long(seqno, 32) - .store_long(valid_until, 32) - .store_long(send_mode, 8) - .store_ref(message_inner) - .finalize(); + vm::CellBuilder cb; + cb.store_long(seqno, 32).store_long(valid_until, 32); + + for (auto& gift : gifts) { + td::int32 send_mode = 3; + auto gramms = gift.gramms; + if (gramms == -1) { + gramms = 0; + send_mode += 128; + } + vm::CellBuilder cbi; + GenericAccount::store_int_message(cbi, gift.destination, gramms); + store_gift_message(cbi, gift); + auto message_inner = cbi.finalize(); + cb.store_long(send_mode, 8).store_ref(std::move(message_inner)); + } + + 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 Wallet::get_init_code() noexcept { - static auto res = [] { - auto serialized_code = td::base64_decode( - "te6ccgEEAQEAAAAAVwAAqv8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x8B+CO78mPtRNDTH9P/" - "0VExuvKhA/kBVBBC+RDyovgAApMg10qW0wfUAvsA6NGkyMsfy//J7VQ=") - .move_as_ok(); - return vm::std_boc_deserialize(serialized_code).move_as_ok(); - }(); - return res; +td::Ref Wallet::get_init_code(td::int32 revision) noexcept { + return SmartContractCode::get_code(ton::SmartContractCode::WalletV2, revision); } vm::CellHash Wallet::get_init_code_hash() noexcept { return get_init_code()->get_hash(); } +td::Ref Wallet::get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept { + return vm::CellBuilder().store_long(seqno, 32).store_bytes(public_key.as_octet_string()).finalize(); +} + td::Ref Wallet::get_init_data(const td::Ed25519::PublicKey& public_key) noexcept { - return vm::CellBuilder().store_long(0, 32).store_bytes(public_key.as_octet_string()).finalize(); + return get_data(public_key, 0); } td::Result Wallet::get_seqno() const { @@ -97,4 +97,20 @@ td::Result Wallet::get_seqno_or_throw() const { return static_cast(vm::load_cell_slice(state_.data).fetch_ulong(32)); } +td::Result Wallet::get_public_key() const { + return TRY_VM(get_public_key_or_throw()); +} + +td::Result Wallet::get_public_key_or_throw() const { + if (state_.data.is_null()) { + return td::Status::Error("data is null"); + } + //FIXME use get method + auto cs = vm::load_cell_slice(state_.data); + cs.skip_first(32); + td::SecureString res(td::Ed25519::PublicKey::LENGTH); + cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast(res.size())); + return td::Ed25519::PublicKey(std::move(res)); +} + } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h index 7cd33c81d1..2299be7cca 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/Wallet.h @@ -14,35 +14,53 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "smc-envelope/SmartContract.h" +#include "smc-envelope/WalletInterface.h" #include "vm/cells.h" #include "Ed25519.h" #include "block/block.h" #include "vm/cells/CellString.h" namespace ton { -class Wallet : ton::SmartContract { +class Wallet : ton::SmartContract, public WalletInterface { public: explicit Wallet(State state) : ton::SmartContract(std::move(state)) { } + explicit Wallet(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) + : Wallet(State{get_init_code(), get_data(public_key, seqno)}) { + } static constexpr unsigned max_message_size = vm::CellString::max_bytes; - static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key) noexcept; + static constexpr unsigned max_gifts_size = 4; + static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key, td::int32 revision = 0) noexcept; static td::Ref get_init_message(const td::Ed25519::PrivateKey& private_key) noexcept; static td::Ref make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 seqno, - td::uint32 valid_until, td::int64 gramms, td::Slice message, - const block::StdAddress& dest_address) noexcept; + td::uint32 valid_until, td::Span gifts) noexcept; - static td::Ref get_init_code() noexcept; + static td::Ref get_init_code(td::int32 revision = 0) noexcept; static vm::CellHash get_init_code_hash() noexcept; static td::Ref get_init_data(const td::Ed25519::PublicKey& public_key) noexcept; + static td::Ref get_data(const td::Ed25519::PublicKey& public_key, td::uint32 seqno) noexcept; td::Result get_seqno() const; + using WalletInterface::get_init_message; + td::Result> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until, + td::Span gifts) const override { + TRY_RESULT(seqno, get_seqno()); + return make_a_gift_message(private_key, seqno, valid_until, gifts); + } + size_t get_max_gifts_size() const override { + return max_gifts_size; + } + + td::Result get_public_key() const override; + private: td::Result get_seqno_or_throw() const; + td::Result get_public_key_or_throw() const; }; } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletInterface.h b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletInterface.h new file mode 100644 index 0000000000..2c7760a1af --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletInterface.h @@ -0,0 +1,72 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#pragma once + +#include "td/utils/common.h" +#include "Ed25519.h" +#include "block/block.h" +#include "vm/cells/CellString.h" + +#include "SmartContract.h" + +namespace ton { +class WalletInterface { + public: + struct Gift { + block::StdAddress destination; + td::int64 gramms; + + bool is_encrypted{false}; + std::string message; + + td::Ref body; + }; + + virtual ~WalletInterface() { + } + + virtual size_t get_max_gifts_size() const = 0; + virtual td::Result> make_a_gift_message(const td::Ed25519::PrivateKey &private_key, + td::uint32 valid_until, td::Span gifts) const = 0; + virtual td::Result get_public_key() const { + return td::Status::Error("TODO"); + } + + td::Result> get_init_message(const td::Ed25519::PrivateKey &private_key, + td::uint32 valid_until = std::numeric_limits::max()) { + return make_a_gift_message(private_key, valid_until, {}); + } + static void store_gift_message(vm::CellBuilder &cb, const Gift &gift) { + if (gift.body.not_null()) { + auto body = vm::load_cell_slice(gift.body); + //TODO: handle error + cb.append_cellslice_bool(body); + return; + } + + if (gift.is_encrypted) { + cb.store_long(1, 32); + } else { + cb.store_long(0, 32); + } + vm::CellString::store(cb, gift.message, 35 * 8).ensure(); + } +}; + +} // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp index db39c725ef..39993c66e6 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.cpp @@ -14,10 +14,11 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "WalletV3.h" #include "GenericAccount.h" +#include "SmartContractCode.h" #include "vm/boc.h" #include "vm/cells/CellString.h" @@ -26,76 +27,70 @@ #include namespace ton { -td::Ref WalletV3::get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept { - auto code = get_init_code(); +td::Ref WalletV3::get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, + td::int32 revision) noexcept { + auto code = get_init_code(revision); auto data = get_init_data(public_key, wallet_id); return GenericAccount::get_init_state(std::move(code), std::move(data)); } -td::Ref WalletV3::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::max(); - auto signature = private_key - .sign(vm::CellBuilder() - .store_long(wallet_id, 32) - .store_long(valid_until, 32) - .store_long(seqno, 32) - .finalize() - ->get_hash() - .as_slice()) - .move_as_ok(); - return vm::CellBuilder() - .store_bytes(signature) - .store_long(wallet_id, 32) - .store_long(valid_until, 32) - .store_long(seqno, 32) - .finalize(); +td::optional WalletV3::guess_revision(const vm::Cell::Hash& code_hash) { + for (td::int32 i = 1; i <= 2; i++) { + if (get_init_code(i)->get_hash() == code_hash) { + return i; + } + } + return {}; +} +td::optional WalletV3::guess_revision(const block::StdAddress& address, + const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) { + for (td::int32 i = 1; i <= 2; i++) { + if (GenericAccount::get_address(address.workchain, get_init_state(public_key, wallet_id, i)) == address) { + return i; + } + } + return {}; } td::Ref WalletV3::make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, - td::uint32 seqno, td::uint32 valid_until, td::int64 gramms, - td::Slice message, const block::StdAddress& dest_address) noexcept { - td::int32 send_mode = 3; - if (gramms == -1) { - gramms = 0; - send_mode += 128; - } - vm::CellBuilder cb; - GenericAccount::store_int_message(cb, dest_address, gramms); - cb.store_bytes("\0\0\0\0", 4); - vm::CellString::store(cb, message, 35 * 8).ensure(); - auto message_inner = cb.finalize(); + td::uint32 seqno, td::uint32 valid_until, + td::Span gifts) noexcept { + CHECK(gifts.size() <= max_gifts_size); - auto message_outer = vm::CellBuilder() - .store_long(wallet_id, 32) - .store_long(valid_until, 32) - .store_long(seqno, 32) - .store_long(send_mode, 8) - .store_ref(message_inner) - .finalize(); + vm::CellBuilder cb; + cb.store_long(wallet_id, 32).store_long(valid_until, 32).store_long(seqno, 32); + + for (auto& gift : gifts) { + td::int32 send_mode = 3; + auto gramms = gift.gramms; + if (gramms == -1) { + gramms = 0; + send_mode += 128; + } + vm::CellBuilder cbi; + GenericAccount::store_int_message(cbi, gift.destination, gramms); + store_gift_message(cbi, gift); + auto message_inner = cbi.finalize(); + cb.store_long(send_mode, 8).store_ref(std::move(message_inner)); + } + + 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 WalletV3::get_init_code() noexcept { - static auto res = [] { - auto serialized_code = td::base64_decode( - "te6ccgEBAQEAYgAAwP8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/" - "9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==") - .move_as_ok(); - return vm::std_boc_deserialize(serialized_code).move_as_ok(); - }(); - return res; +td::Ref WalletV3::get_init_code(td::int32 revision) noexcept { + return SmartContractCode::get_code(ton::SmartContractCode::WalletV3, revision); } vm::CellHash WalletV3::get_init_code_hash() noexcept { return get_init_code()->get_hash(); } -td::Ref WalletV3::get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept { +td::Ref WalletV3::get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, + td::uint32 seqno) noexcept { return vm::CellBuilder() - .store_long(0, 32) + .store_long(seqno, 32) .store_long(wallet_id, 32) .store_bytes(public_key.as_octet_string()) .finalize(); @@ -127,4 +122,20 @@ td::Result WalletV3::get_wallet_id_or_throw() const { return static_cast(cs.fetch_ulong(32)); } +td::Result WalletV3::get_public_key() const { + return TRY_VM(get_public_key_or_throw()); +} + +td::Result WalletV3::get_public_key_or_throw() const { + if (state_.data.is_null()) { + return td::Status::Error("data is null"); + } + //FIXME use get method + auto cs = vm::load_cell_slice(state_.data); + cs.skip_first(64); + td::SecureString res(td::Ed25519::PublicKey::LENGTH); + cs.fetch_bytes(res.as_mutable_slice().ubegin(), td::narrow_cast(res.size())); + return td::Ed25519::PublicKey(std::move(res)); +} + } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h index a6e4162df2..b7c211ca54 100644 --- a/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h +++ b/submodules/ton/tonlib-src/crypto/smc-envelope/WalletV3.h @@ -14,37 +14,59 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "smc-envelope/SmartContract.h" +#include "smc-envelope/WalletInterface.h" #include "vm/cells.h" #include "Ed25519.h" #include "block/block.h" #include "vm/cells/CellString.h" namespace ton { -class WalletV3 : ton::SmartContract { +class WalletV3 : ton::SmartContract, public WalletInterface { public: explicit WalletV3(State state) : ton::SmartContract(std::move(state)) { } + explicit WalletV3(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, td::uint32 seqno = 0) + : WalletV3(State{get_init_code(), get_init_data(public_key, wallet_id, seqno)}) { + } static constexpr unsigned max_message_size = vm::CellString::max_bytes; - static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept; - static td::Ref get_init_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id) noexcept; - static td::Ref make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, - td::uint32 seqno, td::uint32 valid_until, td::int64 gramms, - td::Slice message, const block::StdAddress& dest_address) noexcept; + static constexpr unsigned max_gifts_size = 4; - static td::Ref get_init_code() noexcept; + static td::optional guess_revision(const vm::Cell::Hash& code_hash); + static td::optional guess_revision(const block::StdAddress& address, + const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id); + static td::Ref get_init_state(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, + td::int32 revision = 0) noexcept; + static td::Ref make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 wallet_id, + td::uint32 seqno, td::uint32 valid_until, td::Span gifts) noexcept; + + static td::Ref get_init_code(td::int32 revision = 0) noexcept; static vm::CellHash get_init_code_hash() noexcept; - static td::Ref get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id) noexcept; + static td::Ref get_init_data(const td::Ed25519::PublicKey& public_key, td::uint32 wallet_id, + td::uint32 seqno = 0) noexcept; td::Result get_seqno() const; td::Result get_wallet_id() const; + using WalletInterface::get_init_message; + td::Result> make_a_gift_message(const td::Ed25519::PrivateKey& private_key, td::uint32 valid_until, + td::Span gifts) const override { + TRY_RESULT(seqno, get_seqno()); + TRY_RESULT(wallet_id, get_wallet_id()); + return make_a_gift_message(private_key, wallet_id, seqno, valid_until, gifts); + } + size_t get_max_gifts_size() const override { + return max_gifts_size; + } + td::Result get_public_key() const override; + private: td::Result get_seqno_or_throw() const; td::Result get_wallet_id_or_throw() const; + td::Result get_public_key_or_throw() const; }; } // namespace ton diff --git a/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif b/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif index 307bd2e805..28d711ade7 100644 --- a/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif +++ b/submodules/ton/tonlib-src/crypto/test/fift/testdict.fif @@ -1,4 +1,4 @@ -"Lisp.fif" include +"Lists.fif" include 16 constant key-bits 16 constant val-bits { val-bits u, } : val, @@ -7,8 +7,14 @@ { dictnew { over null? not } { swap uncons swap rot +dictpair } while nip } : mkdict { dup null? { ."(null) " drop } { val@ . } cond } : .val { key-bits { swap . ."-> " .val ."; " true } dictforeach drop cr } : show-dict +{ key-bits { swap . ."-> " .val ."; " true } idictforeach drop cr } : show-idict +{ key-bits { swap . ."-> " .val ."; " true } dictforeachrev drop cr } : show-rev-dict +{ key-bits { swap . ."-> " .val ."; " true } idictforeachrev drop cr } : show-rev-idict { key-bits { rot . ."-> " swap .val .val ."; " true } dictdiff drop cr } : show-dict-diff { key-bits { val@ swap val@ + val, true } dictmerge } : dict-sum +{ key-bits { val@ 2* val, true } dictmap } : dict-twice +{ key-bits { val@ 2 /mod { 2drop false } { val, true } cond } dictmap } : dict-half +{ key-bits { val@ + val, true } dictmapext } : dict-add-x { null swap key-bits { val@ pair swap cons true } dictforeach drop } : dict>list-rev { dict>list-rev list-reverse } : dict>list ( _( 13 169 ) _( 17 289 ) _( 10 100 ) ) mkdict =: Dict @@ -22,3 +28,7 @@ Dict2 dict>list .l cr Dict2 " .val ."; " true } dictforeach drop cr } : show-dict +{ key-bits { swap . ."-> " .val ."; " true } idictforeach drop cr } : show-idict +{ key-bits { swap . ."-> " .val ."; " true } dictforeachrev drop cr } : show-rev-dict +{ key-bits { swap . ."-> " .val ."; " true } idictforeachrev drop cr } : show-rev-idict +{ key-bits { rot . ."-> " swap .val .val ."; " true } dictdiff drop cr } : show-dict-diff +{ key-bits { swap . ."-> " .val ."; " true } rot dictforeachfromx drop cr } : show-dict-from +{ key-bits { val@ swap val@ + val, true } dictmerge } : dict-sum +{ key-bits { val@ 2* val, true } dictmap } : dict-twice +{ key-bits { val@ 2 /mod { 2drop false } { val, true } cond } dictmap } : dict-half +{ key-bits { val@ + val, true } dictmapext } : dict-add-x +{ null swap key-bits { val@ pair swap cons true } dictforeach drop } : dict>list-rev +{ dict>list-rev list-reverse } : dict>list +( _( 13 169 ) _( 17 289 ) _( 10 100 ) ) mkdict =: Dict +_( 4 16 ) _( 9 81 ) Dict +dictpair +dictpair =: Dict1 +_( 4 20 ) _( 101 10201 ) Dict +dictpair +dictpair =: Dict2 +_( 65533 9 ) Dict2 +dictpair =: Dict3 +."Dict1 = " Dict1 show-idict +."Dict2 = " Dict2 show-idict +."Dict3 = " Dict3 show-idict +variable D +{ D ! } : D! +{ ."D = " D @ show-idict } : show-D +{ D @ 2 show-dict-from } : show-D-from +{ D @ 6 show-dict-from } : show-D-from+ +{ D @ 18 show-dict-from } : show-D-from-hint +{ D @ 22 show-dict-from } : show-D-from-hint+ +variable hint hint 0! +{ ."D[" dup ._ ."..] = " show-D-from } : test-from +{ ."D[" dup ._ ."+..] = " show-D-from+ } : test-from+ +{ hint @ ."(hint=" dup ._ .") D[" over ._ ."..] = " show-D-from-hint } : test-from-hint +{ hint @ ."(hint=" dup ._ .") D[" over ._ ."+..] = " show-D-from-hint+ } : test-from-hint+ +{ -16 { 2dup swap execute 1+ } 120 times 2drop } : range-run +{ hint ! ' test-from-hint range-run ' test-from-hint+ range-run } : range-test-hint + +{ ."------- BIG TEST -------" cr show-D + ' test-from range-run ' test-from+ range-run + 0 range-test-hint 13 range-test-hint 7 range-test-hint 100 range-test-hint +} : big-test +Dict1 D! +big-test +Dict2 D! +big-test +Dict3 D! +big-test diff --git a/submodules/ton/tonlib-src/crypto/test/test-db.cpp b/submodules/ton/tonlib-src/crypto/test/test-db.cpp index 148a185494..1b7e19009d 100644 --- a/submodules/ton/tonlib-src/crypto/test/test-db.cpp +++ b/submodules/ton/tonlib-src/crypto/test/test-db.cpp @@ -39,6 +39,7 @@ #include "td/utils/port/path.h" #include "td/utils/format.h" #include "td/utils/misc.h" +#include "td/utils/optional.h" #include "td/utils/tests.h" #include "td/utils/tl_parsers.h" #include "td/utils/tl_helpers.h" @@ -529,16 +530,20 @@ TEST(Cell, MerkleProofCombine) { ASSERT_EQ(exploration_b.log, exploration2.log); } - Ref proof_union; { - proof_union = MerkleProof::combine(proof1, proof2); + auto check = [&](auto proof_union) { + auto virtualized_proof = MerkleProof::virtualize(proof_union, 1); + auto exploration_a = CellExplorer::explore(virtualized_proof, exploration1.ops); + auto exploration_b = CellExplorer::explore(virtualized_proof, exploration2.ops); + ASSERT_EQ(exploration_a.log, exploration1.log); + ASSERT_EQ(exploration_b.log, exploration2.log); + }; + auto proof_union = MerkleProof::combine(proof1, proof2); ASSERT_EQ(proof_union->get_hash(), proof12->get_hash()); + check(proof_union); - auto virtualized_proof = MerkleProof::virtualize(proof_union, 1); - auto exploration_a = CellExplorer::explore(virtualized_proof, exploration1.ops); - auto exploration_b = CellExplorer::explore(virtualized_proof, exploration2.ops); - ASSERT_EQ(exploration_a.log, exploration1.log); - ASSERT_EQ(exploration_b.log, exploration2.log); + auto proof_union_fast = MerkleProof::combine_fast(proof1, proof2); + check(proof_union_fast); } { auto cell = MerkleProof::virtualize(proof12, 1); @@ -1194,6 +1199,88 @@ TEST(Cell, MerkleProofArrayHands) { test_boc_deserializer_full(proof).ensure(); test_boc_deserializer_full(CellBuilder::create_merkle_proof(proof)).ensure(); } + +TEST(Cell, MerkleProofCombineArray) { + size_t n = 1 << 15; + std::vector data; + for (size_t i = 0; i < n; i++) { + data.push_back(i / 3); + } + CompactArray arr(data); + + td::Ref root = vm::CellBuilder::create_merkle_proof(arr.merkle_proof({})); + td::Timer timer; + for (size_t i = 0; i < n; i++) { + auto new_root = vm::CellBuilder::create_merkle_proof(arr.merkle_proof({i})); + root = vm::MerkleProof::combine_fast(root, new_root); + if ((i - 1) % 100 == 0) { + LOG(ERROR) << timer; + timer = {}; + } + } + + CompactArray arr2(n, vm::MerkleProof::virtualize(root, 1)); + for (size_t i = 0; i < n; i++) { + CHECK(arr.get(i) == arr2.get(i)); + } +} + +TEST(Cell, MerkleProofCombineArray2) { + auto a = vm::CellBuilder().store_long(1, 8).finalize(); + auto b = vm::CellBuilder().store_long(2, 8).finalize(); + auto c = vm::CellBuilder().store_long(3, 8).finalize(); + auto d = vm::CellBuilder().store_long(4, 8).finalize(); + auto left = vm::CellBuilder().store_ref(a).store_ref(b).finalize(); + auto right = vm::CellBuilder().store_ref(c).store_ref(d).finalize(); + auto x = vm::CellBuilder().store_ref(left).store_ref(right).finalize(); + size_t n = 18; + //TODO: n = 100, currently TL + for (size_t i = 0; i < n; i++) { + x = vm::CellBuilder().store_ref(x).store_ref(x).finalize(); + } + + td::Ref root; + auto apply_op = [&](auto op) { + auto usage_tree = std::make_shared(); + auto usage_cell = UsageCell::create(x, usage_tree->root_ptr()); + root = usage_cell; + op(); + return MerkleProof::generate(root, usage_tree.get()); + }; + + auto first = apply_op([&] { + auto x = root; + while (true) { + auto cs = vm::load_cell_slice(x); + if (cs.size_refs() == 0) { + break; + } + x = cs.prefetch_ref(0); + } + }); + auto second = apply_op([&] { + auto x = root; + while (true) { + auto cs = vm::load_cell_slice(x); + if (cs.size_refs() == 0) { + break; + } + x = cs.prefetch_ref(1); + } + }); + + { + td::Timer t; + auto x = vm::MerkleProof::combine(first, second); + LOG(ERROR) << "slow " << t; + } + { + td::Timer t; + auto x = vm::MerkleProof::combine_fast(first, second); + LOG(ERROR) << "fast " << t; + } +} + TEST(Cell, MerkleUpdateHands) { auto data = CellBuilder{}.store_bytes("pruned data").store_ref(CellBuilder{}.finalize()).finalize(); auto node = CellBuilder{}.store_bytes("protected data").store_ref(data).finalize(); @@ -1965,6 +2052,222 @@ TEST(Ref, AtomicRef) { LOG(ERROR) << String::total_strings.sum(); } +class FileMerkleTree { + public: + FileMerkleTree(size_t chunks_count, td::Ref root = {}) { + log_n_ = 0; + while ((size_t(1) << log_n_) < chunks_count) { + log_n_++; + } + n_ = size_t(1) << log_n_; + mark_.resize(n_ * 2); + proof_.resize(n_ * 2); + + CHECK(n_ == chunks_count); // TODO: support other chunks_count + //auto x = vm::CellBuilder().finalize(); + root_ = std::move(root); + } + + struct Chunk { + td::size_t index{0}; + td::Slice hash; + }; + + void remove_chunk(td::size_t index) { + CHECK(index < n_); + index += n_; + while (proof_[index].not_null()) { + proof_[index] = {}; + index /= 2; + } + } + + bool has_chunk(td::size_t index) const { + CHECK(index < n_); + index += n_; + return proof_[index].not_null(); + } + + void add_chunk(td::size_t index, td::Slice hash) { + CHECK(hash.size() == 32); + CHECK(index < n_); + index += n_; + auto cell = vm::CellBuilder().store_bytes(hash).finalize(); + CHECK(proof_[index].is_null()); + proof_[index] = std::move(cell); + for (index /= 2; index != 0; index /= 2) { + CHECK(proof_[index].is_null()); + auto &left = proof_[index * 2]; + auto &right = proof_[index * 2 + 1]; + if (left.not_null() && right.not_null()) { + proof_[index] = vm::CellBuilder().store_ref(left).store_ref(right).finalize(); + } else { + mark_[index] = mark_id_; + } + } + } + + td::Status validate_proof(td::Ref new_root) { + // TODO: check structure + return td::Status::OK(); + } + + td::Status add_proof(td::Ref new_root) { + TRY_STATUS(validate_proof(new_root)); + auto combined = vm::MerkleProof::combine_fast_raw(root_, new_root); + if (combined.is_null()) { + return td::Status::Error("Can't combine proofs"); + } + root_ = std::move(combined); + return td::Status::OK(); + } + + td::Status try_add_chunks(td::Span chunks) { + for (auto chunk : chunks) { + if (has_chunk(chunk.index)) { + return td::Status::Error("Already has chunk"); + } + } + mark_id_++; + for (auto chunk : chunks) { + add_chunk(chunk.index, chunk.hash); + } + auto r_new_root = merge(root_, 1); + if (r_new_root.is_error()) { + for (auto chunk : chunks) { + remove_chunk(chunk.index); + } + return r_new_root.move_as_error(); + } + root_ = r_new_root.move_as_ok(); + return td::Status::OK(); + } + + td::Result> merge(td::Ref root, size_t index) { + const auto &down = proof_[index]; + if (down.not_null()) { + if (down->get_hash() != root->get_hash(0)) { + return td::Status::Error("Hash mismatch"); + } + return down; + } + + if (mark_[index] != mark_id_) { + return root; + } + + vm::CellSlice cs(vm::NoVm(), root); + if (cs.is_special()) { + return td::Status::Error("Proof is not enough to validate chunks"); + } + + CHECK(cs.size_refs() == 2); + vm::CellBuilder cb; + cb.store_bits(cs.fetch_bits(cs.size())); + TRY_RESULT(left, merge(cs.fetch_ref(), index * 2)); + TRY_RESULT(right, merge(cs.fetch_ref(), index * 2 + 1)); + cb.store_ref(std::move(left)).store_ref(std::move(right)); + return cb.finalize(); + } + + void init_proof() { + CHECK(proof_[1].not_null()); + root_ = proof_[1]; + } + + td::Result> gen_proof(size_t l, size_t r) { + auto usage_tree = std::make_shared(); + auto usage_cell = vm::UsageCell::create(root_, usage_tree->root_ptr()); + TRY_STATUS(do_gen_proof(std::move(usage_cell), 0, n_ - 1, l, r)); + auto res = vm::MerkleProof::generate_raw(root_, usage_tree.get()); + CHECK(res.not_null()); + return res; + } + + private: + td::size_t n_; // n = 2^log_n + td::size_t log_n_; + td::size_t mark_id_{0}; + std::vector mark_; // n_ * 2 + std::vector> proof_; // n_ * 2 + td::Ref root_; + + td::Status do_gen_proof(td::Ref node, size_t il, size_t ir, size_t l, size_t r) { + if (ir < l || il > r) { + return td::Status::OK(); + } + if (l <= il && ir <= r) { + return td::Status::OK(); + } + vm::CellSlice cs(vm::NoVm(), std::move(node)); + if (cs.is_special()) { + return td::Status::Error("Can't generate a proof"); + } + CHECK(cs.size_refs() == 2); + auto ic = (il + ir) / 2; + TRY_STATUS(do_gen_proof(cs.fetch_ref(), il, ic, l, r)); + TRY_STATUS(do_gen_proof(cs.fetch_ref(), ic + 1, ir, l, r)); + return td::Status::OK(); + } +}; + +TEST(FileMerkleTree, Manual) { + // create big random file + size_t chunk_size = 768; + // for simplicity numer of chunks in a file is a power of two + size_t chunks_count = 1 << 16; + size_t file_size = chunk_size * chunks_count; + td::Timer timer; + LOG(INFO) << "Generate random string"; + const auto file = td::rand_string('a', 'z', td::narrow_cast(file_size)); + LOG(INFO) << timer; + + timer = {}; + LOG(INFO) << "Calculate all hashes"; + std::vector hashes(chunks_count); + for (size_t i = 0; i < chunks_count; i++) { + td::sha256(td::Slice(file).substr(i * chunk_size, chunk_size), hashes[i].as_slice()); + } + LOG(INFO) << timer; + + timer = {}; + LOG(INFO) << "Init merkle tree"; + FileMerkleTree tree(chunks_count); + for (size_t i = 0; i < chunks_count; i++) { + tree.add_chunk(i, hashes[i].as_slice()); + } + tree.init_proof(); + LOG(INFO) << timer; + + auto root_proof = tree.gen_proof(0, chunks_count - 1).move_as_ok(); + + // first download each chunk one by one + + for (size_t stride : {1 << 6, 1}) { + timer = {}; + LOG(INFO) << "Gen all proofs, stride = " << stride; + for (size_t i = 0; i < chunks_count; i += stride) { + tree.gen_proof(i, i + stride - 1).move_as_ok(); + } + LOG(INFO) << timer; + timer = {}; + LOG(INFO) << "Proof size: " << vm::std_boc_serialize(tree.gen_proof(0, stride - 1).move_as_ok()).ok().size(); + LOG(INFO) << "Download file, stride = " << stride; + { + FileMerkleTree new_tree(chunks_count, root_proof); + for (size_t i = 0; i < chunks_count; i += stride) { + new_tree.add_proof(tree.gen_proof(i, i + stride - 1).move_as_ok()).ensure(); + std::vector chunks; + for (size_t j = 0; j < stride; j++) { + chunks.push_back({i + j, hashes[i + j].as_slice()}); + } + new_tree.try_add_chunks(chunks).ensure(); + } + } + LOG(INFO) << timer; + } +} + //TEST(Tmp, Boc) { //LOG(ERROR) << "A"; //auto data = td::read_file("boc"); diff --git a/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp b/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp index c0b991b620..eb6e88802f 100644 --- a/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp +++ b/submodules/ton/tonlib-src/crypto/test/test-smartcont.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/dict.h" #include "common/bigint.hpp" @@ -28,6 +28,7 @@ #include "fift/utils.h" #include "smc-envelope/GenericAccount.h" +#include "smc-envelope/ManualDns.h" #include "smc-envelope/MultisigWallet.h" #include "smc-envelope/SmartContract.h" #include "smc-envelope/SmartContractCode.h" @@ -35,6 +36,8 @@ #include "smc-envelope/TestWallet.h" #include "smc-envelope/Wallet.h" #include "smc-envelope/WalletV3.h" +#include "smc-envelope/HighloadWallet.h" +#include "smc-envelope/HighloadWalletV2.h" #include "td/utils/base64.h" #include "td/utils/crypto.h" @@ -46,6 +49,7 @@ #include "td/utils/PathView.h" #include "td/utils/filesystem.h" #include "td/utils/port/path.h" +#include "td/utils/Variant.h" #include #include @@ -62,8 +66,8 @@ std::string load_source(std::string name) { td::Ref get_test_wallet_source() { std::string code = R"ABCD( SETCP0 DUP IFNOTRET // return if recv_internal -DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method - DROP c4 PUSHCTR CTOS 32 PLDU // cnt +DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods + 1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL // cnt or pubk }> INC 32 THROWIF // fail unless recv_external 512 INT LDSLICEX DUP 32 PLDU // sign cs cnt @@ -90,8 +94,8 @@ INC NEWC 32 STU 256 STU ENDC c4 POPCTR td::Ref get_wallet_source() { std::string code = R"ABCD( SETCP0 DUP IFNOTRET // return if recv_internal - DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method - DROP c4 PUSHCTR CTOS 32 PLDU // cnt + DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods + 1 INT AND c4 PUSHCTR CTOS 32 LDU 256 PLDU CONDSEL // cnt or pubk }> INC 32 THROWIF // fail unless recv_external 9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU // signature in_msg msg_seqno valid_until cs @@ -118,8 +122,8 @@ SETCP0 DUP IFNOTRET // return if recv_internal td::Ref get_wallet_v3_source() { std::string code = R"ABCD( SETCP0 DUP IFNOTRET // return if recv_internal - DUP 85143 INT EQUAL IFJMP:<{ // "seqno" get-method - DROP c4 PUSHCTR CTOS 32 PLDU // cnt + DUP 85143 INT EQUAL OVER 78748 INT EQUAL OR IFJMP:<{ // "seqno" and "get_public_key" get-methods + 1 INT AND c4 PUSHCTR CTOS 32 LDU 32 LDU NIP 256 PLDU CONDSEL // cnt or pubk }> INC 32 THROWIF // fail unless recv_external 9 PUSHPOW2 LDSLICEX DUP 32 LDU 32 LDU 32 LDU // signature in_msg subwallet_id valid_until msg_seqno cs @@ -175,8 +179,15 @@ TEST(Tonlib, TestWallet) { "321", "-C", "TEST"}) .move_as_ok(); auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data; + ton::TestWallet::Gift gift; + gift.destination = dest; + gift.message = "TEST"; + gift.gramms = 321000000000ll; + ton::TestWallet wallet(priv_key.get_public_key().move_as_ok(), 123); + ASSERT_EQ(123u, wallet.get_seqno().ok()); + CHECK(priv_key.get_public_key().ok().as_octet_string() == wallet.get_public_key().ok().as_octet_string()); auto gift_message = ton::GenericAccount::create_ext_message( - address, {}, ton::TestWallet::make_a_gift_message(priv_key, 123, 321000000000ll, "TEST", dest)); + address, {}, wallet.make_a_gift_message(priv_key, 0, {gift}).move_as_ok()); LOG(ERROR) << "-------"; vm::load_cell_slice(gift_message).print_rec(std::cerr); LOG(ERROR) << "-------"; @@ -223,13 +234,20 @@ TEST(Tonlib, Wallet) { }; fift_output.source_lookup.set_os_time(std::make_unique()); auto dest = block::StdAddress::parse("Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX").move_as_ok(); - fift_output = - fift::mem_run_fift(std::move(fift_output.source_lookup), - {"aba", "new-wallet", "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "123", "321"}) - .move_as_ok(); + fift_output = fift::mem_run_fift(std::move(fift_output.source_lookup), + {"aba", "new-wallet", "-C", "TESTv2", + "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "123", "321"}) + .move_as_ok(); auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data; + ton::TestWallet::Gift gift; + gift.destination = dest; + gift.message = "TESTv2"; + gift.gramms = 321000000000ll; + ton::Wallet wallet(priv_key.get_public_key().move_as_ok(), 123); + ASSERT_EQ(123u, wallet.get_seqno().ok()); + CHECK(priv_key.get_public_key().ok().as_octet_string() == wallet.get_public_key().ok().as_octet_string()); auto gift_message = ton::GenericAccount::create_ext_message( - address, {}, ton::Wallet::make_a_gift_message(priv_key, 123, 60, 321000000000ll, "TESTv2", dest)); + address, {}, wallet.make_a_gift_message(priv_key, 60, {gift}).move_as_ok()); LOG(ERROR) << "-------"; vm::load_cell_slice(gift_message).print_rec(std::cerr); LOG(ERROR) << "-------"; @@ -250,7 +268,8 @@ TEST(Tonlib, WalletV3) { td::Ed25519::PrivateKey priv_key{td::SecureString{new_wallet_pk}}; auto pub_key = priv_key.get_public_key().move_as_ok(); auto init_state = ton::WalletV3::get_init_state(pub_key, 239); - auto init_message = ton::WalletV3::get_init_message(priv_key, 239); + auto init_message = + ton::WalletV3(priv_key.get_public_key().move_as_ok(), 239).get_init_message(priv_key).move_as_ok(); auto address = ton::GenericAccount::get_address(0, init_state); CHECK(address.addr.as_slice() == td::Slice(new_wallet_addr).substr(0, 32)); @@ -272,13 +291,24 @@ TEST(Tonlib, WalletV3) { }; fift_output.source_lookup.set_os_time(std::make_unique()); auto dest = block::StdAddress::parse("Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX").move_as_ok(); - fift_output = - fift::mem_run_fift(std::move(fift_output.source_lookup), - {"aba", "new-wallet", "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "239", "123", "321"}) - .move_as_ok(); + fift_output = fift::mem_run_fift(std::move(fift_output.source_lookup), + {"aba", "new-wallet", "-C", "TESTv3", + "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX", "239", "123", "321"}) + .move_as_ok(); auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data; + + ton::WalletV3::Gift gift; + gift.destination = dest; + gift.message = "TESTv3"; + gift.gramms = 321000000000ll; + + ton::WalletV3 wallet(priv_key.get_public_key().move_as_ok(), 239, 123); + ASSERT_EQ(239u, wallet.get_wallet_id().ok()); + ASSERT_EQ(123u, wallet.get_seqno().ok()); + CHECK(priv_key.get_public_key().ok().as_octet_string() == wallet.get_public_key().ok().as_octet_string()); + auto gift_message = ton::GenericAccount::create_ext_message( - address, {}, ton::WalletV3::make_a_gift_message(priv_key, 239, 123, 60, 321000000000ll, "TESTv3", dest)); + address, {}, wallet.make_a_gift_message(priv_key, 60, {gift}).move_as_ok()); LOG(ERROR) << "-------"; vm::load_cell_slice(gift_message).print_rec(std::cerr); LOG(ERROR) << "-------"; @@ -286,6 +316,152 @@ TEST(Tonlib, WalletV3) { CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == gift_message->get_hash()); } +TEST(Tonlib, HighloadWallet) { + auto source_lookup = fift::create_mem_source_lookup(load_source("smartcont/new-highload-wallet.fif")).move_as_ok(); + source_lookup.write_file("/auto/highload-wallet-code.fif", load_source("smartcont/auto/highload-wallet-code.fif")) + .ensure(); + auto fift_output = fift::mem_run_fift(std::move(source_lookup), {"aba", "0", "239"}).move_as_ok(); + + LOG(ERROR) << fift_output.output; + auto new_wallet_pk = fift_output.source_lookup.read_file("new-wallet.pk").move_as_ok().data; + auto new_wallet_query = fift_output.source_lookup.read_file("new-wallet239-query.boc").move_as_ok().data; + auto new_wallet_addr = fift_output.source_lookup.read_file("new-wallet239.addr").move_as_ok().data; + + td::Ed25519::PrivateKey priv_key{td::SecureString{new_wallet_pk}}; + auto pub_key = priv_key.get_public_key().move_as_ok(); + auto init_state = ton::HighloadWallet::get_init_state(pub_key, 239); + auto init_message = ton::HighloadWallet::get_init_message(priv_key, 239); + auto address = ton::GenericAccount::get_address(0, init_state); + + ton::HighloadWallet wallet({ton::HighloadWallet::get_init_code(), ton::HighloadWallet::get_init_data(pub_key, 239)}); + ASSERT_EQ(239u, wallet.get_wallet_id().ok()); + ASSERT_EQ(0u, wallet.get_seqno().ok()); + CHECK(pub_key.as_octet_string() == wallet.get_public_key().ok().as_octet_string()); + + CHECK(address.addr.as_slice() == td::Slice(new_wallet_addr).substr(0, 32)); + + td::Ref res = ton::GenericAccount::create_ext_message(address, init_state, init_message); + + LOG(ERROR) << "---smc-envelope----"; + vm::load_cell_slice(res).print_rec(std::cerr); + LOG(ERROR) << "---fift scripts----"; + vm::load_cell_slice(vm::std_boc_deserialize(new_wallet_query).move_as_ok()).print_rec(std::cerr); + CHECK(vm::std_boc_deserialize(new_wallet_query).move_as_ok()->get_hash() == res->get_hash()); + + fift_output.source_lookup.write_file("/main.fif", load_source("smartcont/highload-wallet.fif")).ensure(); + std::string order; + std::vector gifts; + auto add_order = [&](td::Slice dest_str, td::int64 gramms) { + auto g = td::to_string(gramms); + if (g.size() < 10) { + g = std::string(10 - g.size(), '0') + g; + } + order += PSTRING() << "SEND " << dest_str << " " << g.substr(0, g.size() - 9) << "." << g.substr(g.size() - 9) + << "\n"; + + ton::HighloadWallet::Gift gift; + gift.destination = block::StdAddress::parse(dest_str).move_as_ok(); + gift.gramms = gramms; + gifts.push_back(gift); + }; + std::string dest_str = "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX"; + add_order(dest_str, 0); + add_order(dest_str, 321000000000ll); + add_order(dest_str, 321ll); + fift_output.source_lookup.write_file("/order", order).ensure(); + class ZeroOsTime : public fift::OsTime { + public: + td::uint32 now() override { + return 0; + } + }; + fift_output.source_lookup.set_os_time(std::make_unique()); + fift_output = fift::mem_run_fift(std::move(fift_output.source_lookup), {"aba", "new-wallet", "239", "123", "order"}) + .move_as_ok(); + auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data; + auto gift_message = ton::GenericAccount::create_ext_message( + address, {}, ton::HighloadWallet::make_a_gift_message(priv_key, 239, 123, 60, gifts)); + LOG(ERROR) << "---smc-envelope----"; + vm::load_cell_slice(gift_message).print_rec(std::cerr); + LOG(ERROR) << "---fift scripts----"; + vm::load_cell_slice(vm::std_boc_deserialize(wallet_query).move_as_ok()).print_rec(std::cerr); + CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == gift_message->get_hash()); +} + +TEST(Tonlib, HighloadWalletV2) { + auto source_lookup = fift::create_mem_source_lookup(load_source("smartcont/new-highload-wallet-v2.fif")).move_as_ok(); + source_lookup + .write_file("/auto/highload-wallet-v2-code.fif", load_source("smartcont/auto/highload-wallet-v2-code.fif")) + .ensure(); + class ZeroOsTime : public fift::OsTime { + public: + td::uint32 now() override { + return 0; + } + }; + source_lookup.set_os_time(std::make_unique()); + auto fift_output = fift::mem_run_fift(std::move(source_lookup), {"aba", "0", "239"}).move_as_ok(); + + LOG(ERROR) << fift_output.output; + auto new_wallet_pk = fift_output.source_lookup.read_file("new-wallet.pk").move_as_ok().data; + auto new_wallet_query = fift_output.source_lookup.read_file("new-wallet239-query.boc").move_as_ok().data; + auto new_wallet_addr = fift_output.source_lookup.read_file("new-wallet239.addr").move_as_ok().data; + + td::Ed25519::PrivateKey priv_key{td::SecureString{new_wallet_pk}}; + auto pub_key = priv_key.get_public_key().move_as_ok(); + auto init_state = ton::HighloadWalletV2::get_init_state(pub_key, 239, -1); + auto init_message = ton::HighloadWalletV2::get_init_message(priv_key, 239, 65535); + auto address = ton::GenericAccount::get_address(0, init_state); + + ton::HighloadWalletV2 wallet( + {ton::HighloadWalletV2::get_init_code(-1), ton::HighloadWalletV2::get_init_data(pub_key, 239)}); + ASSERT_EQ(239u, wallet.get_wallet_id().ok()); + CHECK(pub_key.as_octet_string() == wallet.get_public_key().ok().as_octet_string()); + + CHECK(address.addr.as_slice() == td::Slice(new_wallet_addr).substr(0, 32)); + + td::Ref res = ton::GenericAccount::create_ext_message(address, init_state, init_message); + + LOG(ERROR) << "---smc-envelope----"; + vm::load_cell_slice(res).print_rec(std::cerr); + LOG(ERROR) << "---fift scripts----"; + vm::load_cell_slice(vm::std_boc_deserialize(new_wallet_query).move_as_ok()).print_rec(std::cerr); + CHECK(vm::std_boc_deserialize(new_wallet_query).move_as_ok()->get_hash() == res->get_hash()); + + fift_output.source_lookup.write_file("/main.fif", load_source("smartcont/highload-wallet-v2.fif")).ensure(); + std::string order; + std::vector gifts; + auto add_order = [&](td::Slice dest_str, td::int64 gramms) { + auto g = td::to_string(gramms); + if (g.size() < 10) { + g = std::string(10 - g.size(), '0') + g; + } + order += PSTRING() << "SEND " << dest_str << " " << g.substr(0, g.size() - 9) << "." << g.substr(g.size() - 9) + << "\n"; + + ton::HighloadWalletV2::Gift gift; + gift.destination = block::StdAddress::parse(dest_str).move_as_ok(); + gift.gramms = gramms; + gifts.push_back(gift); + }; + std::string dest_str = "Ef9Tj6fMJP+OqhAdhKXxq36DL+HYSzCc3+9O6UNzqsgPfYFX"; + add_order(dest_str, 0); + add_order(dest_str, 321000000000ll); + add_order(dest_str, 321ll); + fift_output.source_lookup.write_file("/order", order).ensure(); + fift_output.source_lookup.set_os_time(std::make_unique()); + fift_output = + fift::mem_run_fift(std::move(fift_output.source_lookup), {"aba", "new-wallet", "239", "order"}).move_as_ok(); + auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data; + auto gift_message = ton::GenericAccount::create_ext_message( + address, {}, ton::HighloadWalletV2::make_a_gift_message(priv_key, 239, 60, gifts)); + LOG(ERROR) << "---smc-envelope----"; + vm::load_cell_slice(gift_message).print_rec(std::cerr); + LOG(ERROR) << "---fift scripts----"; + vm::load_cell_slice(vm::std_boc_deserialize(wallet_query).move_as_ok()).print_rec(std::cerr); + CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == gift_message->get_hash()); +} + TEST(Tonlib, TestGiver) { auto address = block::StdAddress::parse("-1:60c04141c6a7b96d68615e7a91d265ad0f3a9a922e9ae9c901d4fa83f5d3c0d0").move_as_ok(); @@ -297,9 +473,13 @@ TEST(Tonlib, TestGiver) { auto wallet_query = fift_output.source_lookup.read_file("wallet-query.boc").move_as_ok().data; - auto res = ton::GenericAccount::create_ext_message( - ton::TestGiver::address(), {}, - ton::TestGiver::make_a_gift_message(0, 1000000000ll * 6666 / 1000, "GIFT", address)); + ton::TestGiver::Gift gift; + gift.gramms = 1000000000ll * 6666 / 1000; + gift.message = "GIFT"; + gift.destination = address; + td::Ed25519::PrivateKey key{td::SecureString()}; + auto res = ton::GenericAccount::create_ext_message(ton::TestGiver::address(), {}, + ton::TestGiver().make_a_gift_message(key, 0, {gift}).move_as_ok()); vm::CellSlice(vm::NoVm(), res).print_rec(std::cerr); CHECK(vm::std_boc_deserialize(wallet_query).move_as_ok()->get_hash() == res->get_hash()); } @@ -317,13 +497,16 @@ class SimpleWallet : public ton::SmartContract { } static td::Ref create_empty() { - return td::Ref(true, State{ton::SmartContractCode::simple_wallet_ext(), {}}); + return td::Ref(true, + State{ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1Ext), {}}); } static td::Ref create(td::Ref data) { - return td::Ref(true, State{ton::SmartContractCode::simple_wallet_ext(), std::move(data)}); + return td::Ref( + true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1Ext), std::move(data)}); } static td::Ref create_fast(td::Ref data) { - return td::Ref(true, State{ton::SmartContractCode::simple_wallet(), std::move(data)}); + return td::Ref( + true, State{ton::SmartContractCode::get_code(ton::SmartContractCode::WalletV1), std::move(data)}); } td::int32 seqno() const { @@ -387,16 +570,17 @@ TEST(Smartcon, Multisig) { int n = 100; int k = 99; + td::uint32 wallet_id = std::numeric_limits::max() - 3; std::vector keys; for (int i = 0; i < n; i++) { keys.push_back(td::Ed25519::generate_private_key().move_as_ok()); } auto init_state = ms_lib->create_init_data( - td::transform(keys, [](auto& key) { return key.get_public_key().ok().as_octet_string(); }), k); + wallet_id, td::transform(keys, [](auto& key) { return key.get_public_key().ok().as_octet_string(); }), k); auto ms = ton::MultisigWallet::create(init_state); - td::uint64 query_id = 123; - ton::MultisigWallet::QueryBuilder qb(query_id, vm::CellBuilder().finalize()); + td::uint64 query_id = 123 | ((100 * 60ull) << 32); + ton::MultisigWallet::QueryBuilder qb(wallet_id, query_id, vm::CellBuilder().finalize()); // first empty query (init) CHECK(ms.write().send_external_message(vm::CellBuilder().finalize()).code == 0); // first empty query @@ -423,7 +607,7 @@ TEST(Smartcon, Multisig) { ASSERT_EQ(0, ms->processed(query_id)); { - ton::MultisigWallet::QueryBuilder qb(query_id, vm::CellBuilder().finalize()); + ton::MultisigWallet::QueryBuilder qb(wallet_id, query_id, vm::CellBuilder().finalize()); for (int i = 50; i + 1 < 100; i++) { qb.sign(i, keys[i]); } @@ -439,6 +623,7 @@ TEST(Smartcon, Multisig) { TEST(Smartcont, MultisigStress) { int n = 10; int k = 5; + td::uint32 wallet_id = std::numeric_limits::max() - 3; std::vector keys; for (int i = 0; i < n; i++) { @@ -447,13 +632,14 @@ TEST(Smartcont, MultisigStress) { auto public_keys = td::transform(keys, [](auto& key) { return key.get_public_key().ok().as_octet_string(); }); auto ms_lib = ton::MultisigWallet::create(); auto init_state_old = - ms_lib->create_init_data_fast(td::transform(public_keys, [](auto& key) { return key.copy(); }), k); - auto init_state = ms_lib->create_init_data(td::transform(public_keys, [](auto& key) { return key.copy(); }), k); + ms_lib->create_init_data_fast(wallet_id, td::transform(public_keys, [](auto& key) { return key.copy(); }), k); + auto init_state = + ms_lib->create_init_data(wallet_id, td::transform(public_keys, [](auto& key) { return key.copy(); }), k); CHECK(init_state_old->get_hash() == init_state->get_hash()); auto ms = ton::MultisigWallet::create(init_state); CHECK(ms->get_public_keys() == public_keys); - td::int32 now = 0; + td::int32 now = 100 * 60; td::int32 qid = 1; using Mask = std::bitset<128>; struct Query { @@ -498,7 +684,7 @@ TEST(Smartcont, MultisigStress) { }; auto sign_query = [&](Query& query, Mask mask) { - auto qb = ton::MultisigWallet::QueryBuilder(query.id, query.message); + auto qb = ton::MultisigWallet::QueryBuilder(wallet_id, query.id, query.message); int first_i = -1; for (int i = 0; i < (int)mask.size(); i++) { if (mask.test(i)) { @@ -599,3 +785,457 @@ TEST(Smartcont, MultisigStress) { LOG(INFO) << "Final code size: " << ms->code_size(); LOG(INFO) << "Final data size: " << ms->data_size(); } + +class MapDns { + public: + using ManualDns = ton::ManualDns; + struct Entry { + std::string name; + td::int16 category{0}; + std::string text; + + auto key() const { + return std::tie(name, category); + } + bool operator<(const Entry& other) const { + return key() < other.key(); + } + bool operator==(const ton::DnsInterface::Entry& other) const { + return key() == other.key() && other.data.type == ManualDns::EntryData::Type::Text && + other.data.data.get().text == text; + } + bool operator==(const Entry& other) const { + return key() == other.key() && text == other.text; + } + friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Entry& entry) { + return sb << "[" << entry.name << ":" << entry.category << ":" << entry.text << "]"; + } + }; + struct Action { + std::string name; + td::int16 category{0}; + td::optional text; + + bool does_create_category() const { + CHECK(!name.empty()); + CHECK(category != 0); + return static_cast(text); + } + bool does_change_empty() const { + CHECK(!name.empty()); + CHECK(category != 0); + return static_cast(text) && !text.value().empty(); + } + void make_non_empty() { + CHECK(!name.empty()); + CHECK(category != 0); + if (!text) { + text = ""; + } + } + friend td::StringBuilder& operator<<(td::StringBuilder& sb, const Action& entry) { + return sb << "[" << entry.name << ":" << entry.category << ":" << (entry.text ? entry.text.value() : "") + << "]"; + } + }; + void update(td::Span actions) { + for (auto& action : actions) { + do_update(action); + } + } + using CombinedActions = ton::ManualDns::CombinedActions; + void update_combined(td::Span actions) { + LOG(ERROR) << "BEGIN"; + LOG(ERROR) << td::format::as_array(actions); + auto combined_actions = ton::ManualDns::combine_actions(actions); + for (auto& c : combined_actions) { + LOG(ERROR) << c.name << ":" << c.category; + if (c.actions) { + LOG(ERROR) << td::format::as_array(c.actions.value()); + } + } + LOG(ERROR) << "END"; + for (auto& combined_action : combined_actions) { + do_update(combined_action); + } + } + + std::vector resolve(td::Slice name, td::int16 category) { + std::vector res; + if (name.empty()) { + for (auto& a : entries_) { + for (auto& b : a.second) { + res.push_back({a.first, b.first, b.second}); + } + } + } else { + auto it = entries_.find(name); + while (it == entries_.end()) { + auto sz = name.find('.'); + category = -1; + if (sz != td::Slice::npos) { + name = name.substr(sz + 1); + } else { + break; + } + it = entries_.find(name); + } + if (it != entries_.end()) { + for (auto& b : it->second) { + if (category == 0 || category == b.first) { + res.push_back({name.str(), b.first, b.second}); + } + } + } + } + + std::sort(res.begin(), res.end()); + return res; + } + + private: + std::map, std::less<>> entries_; + void do_update(const Action& action) { + if (action.name.empty()) { + entries_.clear(); + return; + } + if (action.category == 0) { + entries_.erase(action.name); + return; + } + if (action.text) { + if (action.text.value().empty()) { + entries_[action.name].erase(action.category); + } else { + entries_[action.name][action.category] = action.text.value(); + } + } else { + auto it = entries_.find(action.name); + if (it != entries_.end()) { + it->second.erase(action.category); + } + } + } + + void do_update(const CombinedActions& actions) { + if (actions.name.empty()) { + entries_.clear(); + LOG(ERROR) << "CLEAR"; + if (!actions.actions) { + return; + } + for (auto& action : actions.actions.value()) { + CHECK(!action.name.empty()); + CHECK(action.category != 0); + CHECK(action.text); + if (action.text.value().empty()) { + entries_[action.name]; + } else { + entries_[action.name][action.category] = action.text.value(); + } + } + return; + } + if (actions.category == 0) { + entries_.erase(actions.name); + LOG(ERROR) << "CLEAR " << actions.name; + if (!actions.actions) { + return; + } + entries_[actions.name]; + for (auto& action : actions.actions.value()) { + CHECK(action.name == actions.name); + CHECK(action.category != 0); + CHECK(action.text); + if (action.text.value().empty()) { + entries_[action.name]; + } else { + entries_[action.name][action.category] = action.text.value(); + } + } + return; + } + CHECK(actions.actions); + CHECK(actions.actions.value().size() == 1); + for (auto& action : actions.actions.value()) { + CHECK(action.name == actions.name); + CHECK(action.category != 0); + if (action.text) { + if (action.text.value().empty()) { + entries_[action.name].erase(action.category); + } else { + entries_[action.name][action.category] = action.text.value(); + } + } else { + auto it = entries_.find(action.name); + if (it != entries_.end()) { + it->second.erase(action.category); + } + } + } + } +}; + +class CheckedDns { + public: + explicit CheckedDns(bool check_smc = true, bool check_combine = true) { + if (check_smc) { + key_ = td::Ed25519::generate_private_key().move_as_ok(); + dns_ = ManualDns::create(ManualDns::create_init_data_fast(key_.value().get_public_key().move_as_ok(), 123)); + } + if (check_combine) { + combined_map_dns_ = MapDns(); + } + } + using Action = MapDns::Action; + using Entry = MapDns::Entry; + void update(td::Span entries) { + if (dns_.not_null()) { + auto smc_actions = td::transform(entries, [](auto& entry) { + ton::DnsInterface::Action action; + action.name = entry.name; + action.category = entry.category; + if (entry.text) { + if (entry.text.value().empty()) { + action.data = td::Ref(); + } else { + action.data = ManualDns::EntryData::text(entry.text.value()).as_cell().move_as_ok(); + } + } + return action; + }); + auto query = dns_->create_update_query(key_.value(), smc_actions).move_as_ok(); + CHECK(dns_.write().send_external_message(std::move(query)).code == 0); + } + map_dns_.update(entries); + if (combined_map_dns_) { + combined_map_dns_.value().update_combined(entries); + } + } + void update(const Action& action) { + return update(td::Span(&action, 1)); + } + + std::vector resolve(td::Slice name, td::int16 category) { + LOG(ERROR) << "RESOLVE: " << name << " " << category; + auto res = map_dns_.resolve(name, category); + LOG(ERROR) << td::format::as_array(res); + + if (dns_.not_null()) { + auto other_res = dns_->resolve(name, category).move_as_ok(); + + std::sort(other_res.begin(), other_res.end()); + if (res.size() != other_res.size()) { + LOG(ERROR) << td::format::as_array(res); + LOG(FATAL) << td::format::as_array(other_res); + } + for (size_t i = 0; i < res.size(); i++) { + if (!(res[i] == other_res[i])) { + LOG(ERROR) << td::format::as_array(res); + LOG(FATAL) << td::format::as_array(other_res); + } + } + } + if (combined_map_dns_) { + auto other_res = combined_map_dns_.value().resolve(name, category); + + std::sort(other_res.begin(), other_res.end()); + if (res.size() != other_res.size()) { + LOG(ERROR) << td::format::as_array(res); + LOG(FATAL) << td::format::as_array(other_res); + } + for (size_t i = 0; i < res.size(); i++) { + if (!(res[i] == other_res[i])) { + LOG(ERROR) << td::format::as_array(res); + LOG(FATAL) << td::format::as_array(other_res); + } + } + } + + return res; + } + + private: + using ManualDns = ton::ManualDns; + td::optional key_; + td::Ref dns_; + + MapDns map_dns_; + td::optional combined_map_dns_; + + void do_update_smc(const Action& entry) { + LOG(ERROR) << td::format::escaped(ManualDns::encode_name(entry.name)); + ton::DnsInterface::Action action; + action.name = entry.name; + action.category = entry.category; + action.data = ManualDns::EntryData::text(entry.text.value()).as_cell().move_as_ok(); + } +}; + +void do_dns_test(CheckedDns&& dns) { + using Action = CheckedDns::Action; + std::vector actions; + + td::Random::Xorshift128plus rnd(123); + + auto gen_name = [&] { + auto cnt = rnd.fast(1, 2); + std::string res; + for (int i = 0; i < cnt; i++) { + if (i != 0) { + res += '.'; + } + auto len = rnd.fast(1, 1); + for (int j = 0; j < len; j++) { + res += static_cast(rnd.fast('a', 'b')); + } + } + return res; + }; + auto gen_text = [&] { + std::string res; + int len = 5; + for (int j = 0; j < len; j++) { + res += static_cast(rnd.fast('a', 'b')); + } + return res; + }; + + auto gen_action = [&] { + Action action; + if (rnd.fast(0, 1000) == 0) { + return action; + } + action.name = gen_name(); + if (rnd.fast(0, 20) == 0) { + return action; + } + action.category = td::narrow_cast(rnd.fast(1, 5)); + if (rnd.fast(0, 4) == 0) { + return action; + } + if (rnd.fast(0, 4) == 0) { + action.text = ""; + return action; + } + action.text = gen_text(); + return action; + }; + + SET_VERBOSITY_LEVEL(VERBOSITY_NAME(ERROR)); + for (int i = 0; i < 100000; i++) { + actions.push_back(gen_action()); + if (rnd.fast(0, 10) == 0) { + dns.update(actions); + actions.clear(); + } + dns.resolve(gen_name(), td::narrow_cast(rnd.fast(0, 5))); + } +}; + +TEST(Smartcont, DnsManual) { + using ManualDns = ton::ManualDns; + auto test_entry_data = [](auto&& entry_data) { + auto cell = entry_data.as_cell().move_as_ok(); + auto cs = vm::load_cell_slice(cell); + auto new_entry_data = ManualDns::EntryData::from_cellslice(cs).move_as_ok(); + ASSERT_EQ(entry_data, new_entry_data); + }; + test_entry_data(ManualDns::EntryData::text("abcd")); + test_entry_data(ManualDns::EntryData::adnl_address(ton::Bits256{})); + + CHECK(td::Slice("a\0b\0") == ManualDns::encode_name("b.a")); + CHECK(td::Slice("a\0b\0") == ManualDns::encode_name(".b.a")); + ASSERT_EQ("b.a", ManualDns::decode_name("a\0b\0")); + ASSERT_EQ("b.a", ManualDns::decode_name("a\0b")); + ASSERT_EQ("", ManualDns::decode_name("")); + + auto key = td::Ed25519::generate_private_key().move_as_ok(); + + auto manual = ManualDns::create(ManualDns::create_init_data_fast(key.get_public_key().move_as_ok(), 123)); + CHECK(manual->get_wallet_id().move_as_ok() == 123); + auto init_query = manual->create_init_query(key).move_as_ok(); + LOG(ERROR) << "A"; + CHECK(manual.write().send_external_message(init_query).code == 0); + LOG(ERROR) << "B"; + CHECK(manual.write().send_external_message(init_query).code != 0); + + auto value = vm::CellBuilder().store_bytes("hello world").finalize(); + auto set_query = + manual + ->sign(key, + manual->prepare(manual->create_set_value_unsigned(1, "a\0b\0", value).move_as_ok(), 1).move_as_ok()) + .move_as_ok(); + CHECK(manual.write().send_external_message(set_query).code == 0); + + auto res = manual->run_get_method( + "dnsresolve", {vm::load_cell_slice_ref(vm::CellBuilder().store_bytes("a\0b\0").finalize()), td::make_refint(1)}); + CHECK(res.code == 0); + CHECK(res.stack.write().pop_cell()->get_hash() == value->get_hash()); + + CheckedDns dns; + dns.update(CheckedDns::Action{"a.b.c", 1, "hello"}); + CHECK(dns.resolve("a.b.c", 1).at(0).text == "hello"); + dns.resolve("a", 1); + dns.resolve("a.b", 1); + CHECK(dns.resolve("a.b.c", 2).empty()); + dns.update(CheckedDns::Action{"a.b.c", 2, "test"}); + CHECK(dns.resolve("a.b.c", 2).at(0).text == "test"); + dns.resolve("a.b.c", 1); + dns.resolve("a.b.c", 2); + LOG(ERROR) << "Test zero category"; + dns.resolve("a.b.c", 0); + dns.update(CheckedDns::Action{"", 0, ""}); + CHECK(dns.resolve("a.b.c", 2).empty()); + + LOG(ERROR) << "Test multipe update"; + { + CheckedDns::Action e[4] = {CheckedDns::Action{"", 0, ""}, CheckedDns::Action{"a.b.c", 1, "hello"}, + CheckedDns::Action{"a.b.c", 2, "world"}, CheckedDns::Action{"x.y.z", 3, "abc"}}; + dns.update(td::Span(e, 4)); + } + dns.resolve("a.b.c", 1); + dns.resolve("a.b.c", 2); + dns.resolve("x.y.z", 3); + + { + CheckedDns::Action e[1] = {CheckedDns::Action{"x.y.z", 0, ""}}; + dns.update(td::Span(e, 1)); + } + + dns.resolve("a.b.c", 1); + dns.resolve("a.b.c", 2); + dns.resolve("x.y.z", 3); + + { + CheckedDns::Action e[3] = {CheckedDns::Action{"x.y.z", 0, ""}, CheckedDns::Action{"x.y.z", 1, "xxx"}, + CheckedDns::Action{"x.y.z", 2, "yyy"}}; + dns.update(td::Span(e, 3)); + } + dns.resolve("a.b.c", 1); + dns.resolve("a.b.c", 2); + dns.resolve("x.y.z", 1); + dns.resolve("x.y.z", 2); + dns.resolve("x.y.z", 3); + + { + auto actions_ext = + ton::ManualDns::parse("delete.name one\nset one 1 TEXT:one\ndelete.name two\nset two 2 TEXT:two").move_as_ok(); + + auto actions = td::transform(actions_ext, [](auto& action) { + td::optional data; + if (action.data) { + data = action.data.value().data.template get().text; + } + return CheckedDns::Action{action.name, action.category, std::move(data)}; + }); + + dns.update(actions); + } + dns.resolve("one", 1); + dns.resolve("two", 2); + + // TODO: rethink semantic of creating an empty dictionary + do_dns_test(CheckedDns(true, true)); +} diff --git a/submodules/ton/tonlib-src/crypto/test/vm.cpp b/submodules/ton/tonlib-src/crypto/test/vm.cpp index 72e2f8c61b..77157f6d84 100644 --- a/submodules/ton/tonlib-src/crypto/test/vm.cpp +++ b/submodules/ton/tonlib-src/crypto/test/vm.cpp @@ -14,9 +14,9 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ -#include "vm/continuation.h" +#include "vm/vm.h" #include "vm/cp0.h" #include "vm/dict.h" #include "fift/utils.h" diff --git a/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp b/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp index bbf3adf79c..dedec15d49 100644 --- a/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp +++ b/submodules/ton/tonlib-src/crypto/tl/tlbc-gen-cpp.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "tlbc-gen-cpp.h" #include "td/utils/bits.h" @@ -94,6 +94,7 @@ void init_forbidden_cpp_idents() { l.insert("get_size"); l.insert("pack"); l.insert("unpack"); + l.insert("ops"); l.insert("cs"); l.insert("cb"); l.insert("cell_ref"); @@ -922,7 +923,7 @@ void CppTypeCode::generate_get_tag_param1(std::ostream& os, std::string nl, cons match_param_pattern(os, nl, A, 8, "# > 1 && (# & 1)", param_names[0])) { return; } - os << nl << "static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }"; + os << nl << "// static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }"; os << nl << "static signed char ctab[4] = { "; for (int i = 0; i < 4; i++) { if (i > 0) { @@ -941,7 +942,7 @@ void CppTypeCode::generate_get_tag_param2(std::ostream& os, std::string nl, cons os << ' ' << (int)A[i][j]; } } - os << nl << "static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }"; + os << nl << "// static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }"; os << nl << "static signed char ctab[4][4] = { "; for (int i = 0; i < 16; i++) { if (i > 0) { @@ -964,7 +965,7 @@ void CppTypeCode::generate_get_tag_param3(std::ostream& os, std::string nl, cons } } } - os << nl << "static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }"; + os << nl << "// static inline size_t nat_abs(int x) { return (x > 1) * 2 + (x & 1); }"; os << nl << "static signed char ctab[4][4][4] = { "; for (int i = 0; i < 64; i++) { if (i > 0) { @@ -2014,7 +2015,7 @@ void CppTypeCode::generate_skip_field(const Constructor& constr, const Field& fi output_cpp_expr(ss, expr, 100, true); ss << '.'; } - ss << (validating ? "validate_skip(cs, weak" : "skip(cs"); + ss << (validating ? "validate_skip(ops, cs, weak" : "skip(cs"); output_negative_type_arguments(ss, expr); ss << ")"; actions += Action{std::move(ss)}; @@ -2054,7 +2055,7 @@ void CppTypeCode::generate_skip_field(const Constructor& constr, const Field& fi output_cpp_expr(ss, expr, 100); ss << '.'; } - ss << (validating ? "validate_skip(cs, weak)" : "skip(cs)") << tail; + ss << (validating ? "validate_skip(ops, cs, weak)" : "skip(cs)") << tail; actions += Action{std::move(ss)}; return; } @@ -2074,7 +2075,7 @@ void CppTypeCode::generate_skip_field(const Constructor& constr, const Field& fi output_cpp_expr(ss, expr, 100); ss << '.'; } - ss << "validate_skip_ref(cs, weak)" << tail; + ss << "validate_skip_ref(ops, cs, weak)" << tail; actions += Action{ss.str()}; } @@ -2101,8 +2102,8 @@ void CppTypeCode::generate_skip_cons_method(std::ostream& os, std::string nl, in void CppTypeCode::generate_skip_method(std::ostream& os, int options) { bool validate = options & 1; bool ret_ext = options & 2; - os << "\nbool " << cpp_type_class_name << "::" << (validate ? "validate_" : "") << "skip(vm::CellSlice& cs" - << (validate ? ", bool weak" : ""); + os << "\nbool " << cpp_type_class_name + << "::" << (validate ? "validate_skip(int* ops, vm::CellSlice& cs, bool weak" : "skip(vm::CellSlice& cs"); if (ret_ext) { os << skip_extra_args; } @@ -2470,7 +2471,7 @@ void CppTypeCode::generate_unpack_field(const CppTypeCode::ConsField& fi, const output_cpp_expr(ss, expr, 100, true); ss << '.'; } - ss << (validating ? "validate_fetch_to(cs, weak, " : "fetch_to(cs, ") << field_vars.at(i); + ss << (validating ? "validate_fetch_to(ops, cs, weak, " : "fetch_to(cs, ") << field_vars.at(i); output_negative_type_arguments(ss, expr); ss << ")"; actions += Action{std::move(ss)}; @@ -2514,8 +2515,8 @@ void CppTypeCode::generate_unpack_field(const CppTypeCode::ConsField& fi, const output_cpp_expr(ss, expr, 100); ss << '.'; } - ss << (validating ? "validate_" : "") << "fetch_" << (cvt == ct_enum ? "enum_" : "") << "to(cs, " - << (validating ? "weak, " : "") << field_vars.at(i) << ")" << tail; + ss << (validating ? "validate_" : "") << "fetch_" << (cvt == ct_enum ? "enum_" : "") + << (validating ? "to(ops, cs, weak, " : "to(cs, ") << field_vars.at(i) << ")" << tail; field_var_set[i] = true; actions += Action{std::move(ss)}; return; @@ -2540,7 +2541,7 @@ void CppTypeCode::generate_unpack_field(const CppTypeCode::ConsField& fi, const output_cpp_expr(ss, expr, 100); ss << '.'; } - ss << "validate_ref(" << field_vars.at(i) << "))" << tail; + ss << "validate_ref(ops, " << field_vars.at(i) << "))" << tail; actions += Action{ss.str()}; } @@ -2559,7 +2560,11 @@ void CppTypeCode::generate_unpack_method(std::ostream& os, CppTypeCode::ConsReco << "\n auto cs = load_cell_slice(std::move(cell_ref));" << "\n return " << (options & 1 ? "validate_" : "") << "unpack"; if (!(options & 8)) { - os << "(cs, data"; + os << "("; + if (options & 1) { + os << "ops, "; + } + os << "cs, data"; } else { os << "_" << cons_enum_name.at(rec.cons_idx) << "(cs"; for (const auto& f : rec.cpp_fields) { @@ -2773,7 +2778,7 @@ void CppTypeCode::generate_pack_field(const CppTypeCode::ConsField& fi, const Co output_cpp_expr(ss, expr, 100); ss << '.'; } - ss << "validate_ref(" << field_vars.at(i) << "))" << tail; + ss << "validate_ref(ops, " << field_vars.at(i) << "))" << tail; actions += Action{ss.str()}; } @@ -3093,7 +3098,7 @@ void CppTypeCode::generate_header(std::ostream& os, int options) { if (ret_params) { os << " bool skip(vm::CellSlice& cs" << skip_extra_args << ") const;\n"; } - os << " bool validate_skip(vm::CellSlice& cs, bool weak = false) const override"; + os << " bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override"; if (!inline_validate_skip) { os << ";\n"; } else if (sz) { @@ -3102,7 +3107,7 @@ void CppTypeCode::generate_header(std::ostream& os, int options) { os << " {\n return true;\n }\n"; } if (ret_params) { - os << " bool validate_skip(vm::CellSlice& cs, bool weak" << skip_extra_args << ") const;\n"; + os << " bool validate_skip(int *ops, vm::CellSlice& cs, bool weak" << skip_extra_args << ") const;\n"; os << " bool fetch_to(vm::CellSlice& cs, Ref& res" << skip_extra_args << ") const;\n"; } if (type.is_simple_enum) { @@ -3257,6 +3262,31 @@ void generate_type_constants(std::ostream& os, int mode) { } } +void generate_register_function(std::ostream& os, int mode) { + os << "\n// " << (mode ? "definition" : "declaration") << " of type name registration function\n"; + if (!mode) { + os << "extern bool register_simple_types(std::function func);\n"; + return; + } + os << "bool register_simple_types(std::function func) {\n"; + os << " return "; + int k = 0; + for (int i = builtin_types_num; i < types_num; i++) { + Type& type = types[i]; + CppTypeCode& cc = *cpp_type[i]; + if (!cc.cpp_type_var_name.empty() && type.type_name) { + if (k++) { + os << "\n && "; + } + os << "func(\"" << type.get_name() << "\", &" << cc.cpp_type_var_name << ")"; + } + } + if (!k) { + os << "true"; + } + os << ";\n}\n\n"; +} + void assign_const_type_cpp_idents() { const_type_expr_cpp_idents.resize(const_type_expr_num + 1, ""); const_type_expr_simple.resize(const_type_expr_num + 1, false); @@ -3389,6 +3419,7 @@ void generate_cpp_output_to(std::ostream& os, int options = 0, std::vector= '0' && c <= '9') { c -= '0'; + } else if (c >= 'A' && c <= 'F') { + c -= 'A' - 10; } else if (c >= 'a' && c <= 'f') { c -= 'a' - 10; } else { @@ -146,6 +148,9 @@ unsigned long long get_special_value(std::string str) { while (bits && !((val >> (64 - bits)) & 1)) { --bits; } + if (bits) { + --bits; + } } if (bits == 64) { return 0; diff --git a/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp b/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp index 40637c57b4..617c298bb0 100644 --- a/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp +++ b/submodules/ton/tonlib-src/crypto/tl/tlblib.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include @@ -33,6 +33,12 @@ const NatWidth t_Nat{32}; const Anything t_Anything; const RefAnything t_RefCell; +std::string TLB::get_type_name() const { + std::ostringstream os; + print_type(os); + return os.str(); +} + bool Bool::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { int t = get_tag(cs); return cs.advance(1) && pp.out(t ? "bool_true" : "bool_false"); @@ -108,46 +114,52 @@ bool TupleT::skip(vm::CellSlice& cs) const { return !i; } -bool TupleT::validate_skip(vm::CellSlice& cs, bool weak) const { +bool TupleT::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int i = n; for (; i > 0; --i) { - if (!X.validate_skip(cs, weak)) { + if (!X.validate_skip(ops, cs, weak)) { break; } } return !i; } -bool TLB::validate_ref_internal(Ref cell_ref, bool weak) const { +bool TLB::validate_ref_internal(int* ops, Ref cell_ref, bool weak) const { + if (ops && --*ops < 0) { + return false; + } bool is_special; auto cs = load_cell_slice_special(std::move(cell_ref), is_special); - return always_special() ? is_special : (is_special ? weak : (validate_skip(cs) && cs.empty_ext())); + return always_special() ? is_special : (is_special ? weak : (validate_skip(ops, cs) && cs.empty_ext())); } bool TLB::print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const { pp.open("raw@"); pp << *this << ' '; vm::CellSlice cs_copy{cs}; - if (!validate_skip(cs) || !cs_copy.cut_tail(cs)) { + int size_limit = pp.limit; + if (!validate_skip(&size_limit, cs) || !cs_copy.cut_tail(cs)) { return pp.fail("invalid value"); } pp.raw_nl(); - cs_copy.print_rec(pp.os, pp.indent); - return pp.mkindent() && pp.close(); + return (cs_copy.print_rec(pp.os, &pp.limit, pp.indent) && pp.mkindent() && pp.close()) || + pp.fail("raw value too long"); } bool TLB::print_special(PrettyPrinter& pp, vm::CellSlice& cs) const { pp.open("raw@"); pp << *this << ' '; pp.raw_nl(); - cs.print_rec(pp.os, pp.indent); - return pp.mkindent() && pp.close(); + return (cs.print_rec(pp.os, &pp.limit, pp.indent) && pp.mkindent() && pp.close()) || pp.fail("raw value too long"); } bool TLB::print_ref(PrettyPrinter& pp, Ref cell_ref) const { if (cell_ref.is_null()) { return pp.fail("null cell reference"); } + if (!pp.register_recursive_call()) { + return pp.fail("too many recursive calls while printing a TL-B value"); + } bool is_special; auto cs = load_cell_slice_special(std::move(cell_ref), is_special); if (is_special) { @@ -157,18 +169,21 @@ bool TLB::print_ref(PrettyPrinter& pp, Ref cell_ref) const { } } -bool TLB::print_skip(std::ostream& os, vm::CellSlice& cs, int indent) const { +bool TLB::print_skip(std::ostream& os, vm::CellSlice& cs, int indent, int rec_limit) const { PrettyPrinter pp{os, indent}; + pp.set_limit(rec_limit); return pp.fail_unless(print_skip(pp, cs)); } -bool TLB::print(std::ostream& os, const vm::CellSlice& cs, int indent) const { +bool TLB::print(std::ostream& os, const vm::CellSlice& cs, int indent, int rec_limit) const { PrettyPrinter pp{os, indent}; + pp.set_limit(rec_limit); return pp.fail_unless(print(pp, cs)); } -bool TLB::print_ref(std::ostream& os, Ref cell_ref, int indent) const { +bool TLB::print_ref(std::ostream& os, Ref cell_ref, int indent, int rec_limit) const { PrettyPrinter pp{os, indent}; + pp.set_limit(rec_limit); return pp.fail_unless(print_ref(pp, std::move(cell_ref))); } @@ -207,7 +222,7 @@ PrettyPrinter::~PrettyPrinter() { } bool PrettyPrinter::fail(std::string msg) { - os << ""; + os << "" << std::endl; failed = true; return false; } @@ -340,3 +355,24 @@ bool PrettyPrinter::fetch_uint256_field(vm::CellSlice& cs, int n, std::string na } } // namespace tlb + +namespace tlb { + +bool TypenameLookup::register_types(typename TypenameLookup::register_func_t func) { + return func([this](const char* name, const TLB* tp) { return register_type(name, tp); }); +} + +bool TypenameLookup::register_type(const char* name, const TLB* tp) { + if (!name || !tp) { + return false; + } + auto res = types.emplace(name, tp); + return res.second; +} + +const TLB* TypenameLookup::lookup(std::string str) const { + auto it = types.find(str); + return it != types.end() ? it->second : nullptr; +} + +} // namespace tlb diff --git a/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp b/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp index b5d51c3154..7543d38f19 100644 --- a/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp +++ b/submodules/ton/tonlib-src/crypto/tl/tlblib.hpp @@ -14,10 +14,11 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include +#include #include "vm/cellslice.h" namespace tlb { @@ -29,6 +30,7 @@ struct PrettyPrinter; class TLB { public: + enum { default_validate_max_cells = 1024 }; virtual ~TLB() = default; virtual int get_size(const vm::CellSlice& cs) const { return -1; @@ -36,14 +38,26 @@ class TLB { virtual bool skip(vm::CellSlice& cs) const { return cs.skip_ext(get_size(cs)); } - virtual bool validate(const vm::CellSlice& cs, bool weak = false) const { + virtual bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const { return cs.have_ext(get_size(cs)); } - virtual bool validate_exact(const vm::CellSlice& cs, bool weak = false) const { + virtual bool validate_exact(int* ops, const vm::CellSlice& cs, bool weak = false) const { return (int)cs.size_ext() == get_size(cs); } + bool validate_upto(int ops, const vm::CellSlice& cs, bool weak = false) const { + return validate(&ops, cs, weak); + } + bool validate_exact_upto(int ops, const vm::CellSlice& cs, bool weak = false) const { + return validate_exact(&ops, cs, weak); + } + bool validate_csr(int* ops, Ref cs_ref, bool weak = false) const { + return cs_ref.not_null() && validate_skip_exact(ops, cs_ref.write(), weak); + } + bool validate_csr(int ops, Ref cs_ref, bool weak = false) const { + return validate_csr(&ops, std::move(cs_ref), weak); + } bool validate_csr(Ref cs_ref, bool weak = false) const { - return cs_ref.not_null() && validate_skip_exact(cs_ref.write(), weak); + return validate_csr(default_validate_max_cells, std::move(cs_ref), weak); } Ref fetch(vm::CellSlice& cs) const { return cs.fetch_subslice_ext(get_size(cs)); @@ -51,67 +65,71 @@ class TLB { Ref prefetch(const vm::CellSlice& cs) const { return cs.prefetch_subslice_ext(get_size(cs)); } - virtual Ref validate_fetch(vm::CellSlice& cs, bool weak = false) const { - return validate(cs, weak) ? cs.fetch_subslice_ext(get_size(cs)) : Ref{}; + virtual Ref validate_fetch(int* ops, vm::CellSlice& cs, bool weak = false) const { + return validate(ops, cs, weak) ? cs.fetch_subslice_ext(get_size(cs)) : Ref{}; } - virtual Ref validate_prefetch(const vm::CellSlice& cs, bool weak = false) const { - return validate(cs, weak) ? cs.prefetch_subslice_ext(get_size(cs)) : Ref{}; + virtual Ref validate_prefetch(int* ops, const vm::CellSlice& cs, bool weak = false) const { + return validate(ops, cs, weak) ? cs.prefetch_subslice_ext(get_size(cs)) : Ref{}; } bool fetch_to(vm::CellSlice& cs, Ref& res) const { return (res = fetch(cs)).not_null(); } - bool validate_fetch_to(vm::CellSlice& cs, Ref& res, bool weak = false) const { - return (res = validate_fetch(cs, weak)).not_null(); + bool validate_fetch_to(int* ops, vm::CellSlice& cs, Ref& res, bool weak = false) const { + return (res = validate_fetch(ops, cs, weak)).not_null(); } bool store_from(vm::CellBuilder& cb, Ref field) const { return field.not_null() && get_size(*field) == (int)field->size_ext() && cb.append_cellslice_bool(std::move(field)); } - bool validate_store_from(vm::CellBuilder& cb, Ref field, bool weak = false) const { + bool validate_store_from(int* ops, vm::CellBuilder& cb, Ref field, bool weak = false) const { if (field.is_null()) { return false; } vm::CellSlice cs{*field}; - return validate_skip(cs, weak) && cs.empty_ext() && cb.append_cellslice_bool(std::move(field)); + return validate_skip(ops, cs, weak) && cs.empty_ext() && cb.append_cellslice_bool(std::move(field)); } virtual bool extract(vm::CellSlice& cs) const { return cs.only_ext(get_size(cs)); } - virtual bool validate_extract(vm::CellSlice& cs, bool weak = false) const { - return validate(cs, weak) && extract(cs); + virtual bool validate_extract(int* ops, vm::CellSlice& cs, bool weak = false) const { + return validate(ops, cs, weak) && extract(cs); } int get_size_by_skip(const vm::CellSlice& cs) const { vm::CellSlice copy{cs}; return skip(copy) ? copy.subtract_base_ext(cs) : -1; } - virtual bool validate_skip(vm::CellSlice& cs, bool weak = false) const { - return validate(cs, weak) && skip(cs); + virtual bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const { + return validate(ops, cs, weak) && skip(cs); } - bool validate_skip_exact(vm::CellSlice& cs, bool weak = false) const { - return validate_skip(cs, weak) && cs.empty_ext(); + bool validate_skip_upto(int ops, vm::CellSlice& cs, bool weak = false) const { + return validate_skip(&ops, cs, weak); } - bool validate_by_skip(const vm::CellSlice& cs, bool weak = false) const { + bool validate_skip_exact(int* ops, vm::CellSlice& cs, bool weak = false) const { + return validate_skip(ops, cs, weak) && cs.empty_ext(); + } + bool validate_by_skip(int* ops, const vm::CellSlice& cs, bool weak = false) const { vm::CellSlice copy{cs}; - return validate_skip(copy, weak); + return validate_skip(ops, copy, weak); } - bool validate_by_skip_exact(const vm::CellSlice& cs, bool weak = false) const { + bool validate_by_skip_exact(int* ops, const vm::CellSlice& cs, bool weak = false) const { vm::CellSlice copy{cs}; - return validate_skip_exact(copy, weak); + return validate_skip_exact(ops, copy, weak); } bool extract_by_skip(vm::CellSlice& cs) const { vm::CellSlice copy{cs}; return skip(copy) && cs.cut_tail(copy); } - bool validate_extract_by_skip(vm::CellSlice& cs, bool weak = false) const { + bool validate_extract_by_skip(int* ops, vm::CellSlice& cs, bool weak = false) const { vm::CellSlice copy{cs}; - return validate_skip(copy, weak) && cs.cut_tail(copy); + return validate_skip(ops, copy, weak) && cs.cut_tail(copy); } - Ref validate_fetch_by_skip(vm::CellSlice& cs, bool weak = false) const { + Ref validate_fetch_by_skip(int* ops, vm::CellSlice& cs, bool weak = false) const { Ref copy{true, cs}; - return validate_skip(cs, weak) && copy.unique_write().cut_tail(cs) ? copy : Ref{}; + return validate_skip(ops, cs, weak) && copy.unique_write().cut_tail(cs) ? copy : Ref{}; } - Ref validate_prefetch_by_skip(const vm::CellSlice& cs, bool weak = false) const { + Ref validate_prefetch_by_skip(int* ops, const vm::CellSlice& cs, bool weak = false) const { vm::CellSlice copy{cs}; - return validate_skip(copy, false) ? cs.prefetch_subslice_ext(copy.subtract_base_ext(cs)) : Ref{}; + return validate_skip(ops, copy, false) ? cs.prefetch_subslice_ext(copy.subtract_base_ext(cs)) + : Ref{}; } virtual bool skip_copy(vm::CellBuilder& cb, vm::CellSlice& cs) const { return cb.append_cellslice_bool(fetch(cs)); @@ -155,14 +173,29 @@ class TLB { bool as_integer_to(Ref cs_ref, td::RefInt256& res) const { return (res = as_integer(std::move(cs_ref))).not_null(); } + bool validate_ref(int* ops, Ref cell_ref, bool weak = false) const { + return cell_ref.not_null() && validate_ref_internal(ops, std::move(cell_ref), weak); + } + bool validate_ref(int ops, Ref cell_ref, bool weak = false) const { + return validate_ref(&ops, std::move(cell_ref), weak); + } bool validate_ref(Ref cell_ref, bool weak = false) const { - return cell_ref.not_null() && validate_ref_internal(std::move(cell_ref), weak); + return validate_ref(default_validate_max_cells, std::move(cell_ref), weak); + } + bool force_validate_ref(int* ops, Ref cell_ref) const { + return cell_ref.not_null() && validate_ref_internal(ops, std::move(cell_ref), false); + } + bool force_validate_ref(int ops, Ref cell_ref) const { + return force_validate_ref(&ops, std::move(cell_ref)); } bool force_validate_ref(Ref cell_ref) const { - return cell_ref.not_null() && validate_ref_internal(std::move(cell_ref), false); + return force_validate_ref(default_validate_max_cells, std::move(cell_ref)); } - bool validate_skip_ref(vm::CellSlice& cs, bool weak = false) const { - return validate_ref(cs.fetch_ref(), weak); + bool validate_skip_ref(int* ops, vm::CellSlice& cs, bool weak = false) const { + return validate_ref(ops, cs.fetch_ref(), weak); + } + bool validate_skip_ref(int ops, vm::CellSlice& cs, bool weak = false) const { + return validate_skip_ref(&ops, cs, weak); } virtual bool null_value(vm::CellBuilder& cb) const { return false; @@ -196,6 +229,7 @@ class TLB { virtual std::ostream& print_type(std::ostream& os) const { return os << ""; } + std::string get_type_name() const; virtual bool print_skip(PrettyPrinter& pp, vm::CellSlice& cs) const; virtual bool print(PrettyPrinter& pp, const vm::CellSlice& cs) const { vm::CellSlice cs_copy{cs}; @@ -206,21 +240,27 @@ class TLB { bool print(PrettyPrinter& pp, Ref cs_ref) const { return print(pp, *cs_ref); } - bool print_skip(std::ostream& os, vm::CellSlice& cs, int indent = 0) const; - bool print(std::ostream& os, const vm::CellSlice& cs, int indent = 0) const; - bool print(std::ostream& os, Ref cs_ref, int indent = 0) const { - return print(os, *cs_ref, indent); + bool print_skip(std::ostream& os, vm::CellSlice& cs, int indent = 0, int rec_limit = 0) const; + bool print(std::ostream& os, const vm::CellSlice& cs, int indent = 0, int rec_limit = 0) const; + bool print(std::ostream& os, Ref cs_ref, int indent = 0, int rec_limit = 0) const { + return print(os, *cs_ref, indent, rec_limit); + } + bool print_ref(std::ostream& os, Ref cell_ref, int indent = 0, int rec_limit = 0) const; + bool print_ref(int rec_limit, std::ostream& os, Ref cell_ref, int indent = 0) const { + return print_ref(os, std::move(cell_ref), indent, rec_limit); } - bool print_ref(std::ostream& os, Ref cell_ref, int indent = 0) const; std::string as_string_skip(vm::CellSlice& cs, int indent = 0) const; std::string as_string(const vm::CellSlice& cs, int indent = 0) const; std::string as_string(Ref cs_ref, int indent = 0) const { return cs_ref.not_null() ? as_string(*cs_ref, indent) : ""; } std::string as_string_ref(Ref cell_ref, int indent = 0) const; + static inline size_t nat_abs(int x) { + return (x > 1) * 2 + (x & 1); + } protected: - bool validate_ref_internal(Ref cell_ref, bool weak = false) const; + bool validate_ref_internal(int* ops, Ref cell_ref, bool weak = false) const; }; static inline std::ostream& operator<<(std::ostream& os, const TLB& type) { @@ -229,29 +269,29 @@ static inline std::ostream& operator<<(std::ostream& os, const TLB& type) { struct TLB_Complex : TLB { bool skip(vm::CellSlice& cs) const override { - return validate_skip(cs); + return validate_skip(nullptr, cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override = 0; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override = 0; int get_size(const vm::CellSlice& cs) const override { return get_size_by_skip(cs); } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { - return validate_by_skip(cs, weak); + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return validate_by_skip(ops, cs, weak); } - bool validate_exact(const vm::CellSlice& cs, bool weak = false) const override { - return validate_by_skip_exact(cs, weak); + bool validate_exact(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return validate_by_skip_exact(ops, cs, weak); } bool extract(vm::CellSlice& cs) const override { return extract_by_skip(cs); } - bool validate_extract(vm::CellSlice& cs, bool weak = false) const override { - return validate_extract_by_skip(cs, weak); + bool validate_extract(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return validate_extract_by_skip(ops, cs, weak); } - Ref validate_fetch(vm::CellSlice& cs, bool weak = false) const override { - return validate_fetch_by_skip(cs, weak); + Ref validate_fetch(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return validate_fetch_by_skip(ops, cs, weak); } - Ref validate_prefetch(const vm::CellSlice& cs, bool weak = false) const override { - return validate_prefetch_by_skip(cs, weak); + Ref validate_prefetch(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return validate_prefetch_by_skip(ops, cs, weak); } td::RefInt256 as_integer(const vm::CellSlice& cs) const override { vm::CellSlice copy{cs}; @@ -264,6 +304,30 @@ struct TLB_Complex : TLB { } }; +class TlbTypeHolder : public td::CntObject { + const TLB* type{nullptr}; + char* data{nullptr}; + + public: + TlbTypeHolder() = default; + TlbTypeHolder(const TLB* _type) : type(_type), data(nullptr) { + } + TlbTypeHolder(const TLB* _type, char* _data) : type(_type), data(_data) { + } + ~TlbTypeHolder() override { + free(data); + } + const TLB* get() const { + return type; + } + const TLB& operator*() const { + return *type; + } + const TLB* operator->() const { + return type; + } +}; + static inline bool add_chk(int x, int y, int z) { return x + y == z && z >= 0; } @@ -427,15 +491,20 @@ bool store_from(vm::CellBuilder& cb, const T& tlb_type, Ref field namespace tlb { struct PrettyPrinter { + enum { default_print_limit = 4096 }; std::ostream& os; int indent; int level; bool failed; bool nl_used; int mode; + int limit{default_print_limit}; PrettyPrinter(std::ostream& _os, int _indent = 0, int _mode = 1) : os(_os), indent(_indent), level(0), failed(false), nl_used(false), mode(_mode) { } + PrettyPrinter(int _limit, std::ostream& _os, int _indent = 0, int _mode = 1) + : os(_os), indent(_indent), level(0), failed(false), nl_used(false), mode(_mode), limit(_limit) { + } ~PrettyPrinter(); bool ok() const { return !failed && !level; @@ -460,6 +529,14 @@ struct PrettyPrinter { bool field_int(long long value, std::string name); bool field_uint(unsigned long long value); bool field_uint(unsigned long long value, std::string name); + bool register_recursive_call() { + return limit--; + } + void set_limit(int new_limit) { + if (new_limit > 0) { + limit = new_limit; + } + } bool out(std::string str) { os << str; return true; @@ -504,6 +581,25 @@ struct PrettyPrinter { namespace tlb { +class TypenameLookup { + std::map types; + + public: + typedef std::function simple_register_func_t; + typedef std::function register_func_t; + TypenameLookup() = default; + TypenameLookup(register_func_t func) { + register_types(func); + } + bool register_type(const char* name, const TLB* tp); + bool register_types(register_func_t func); + const TLB* lookup(std::string str) const; +}; + +} // namespace tlb + +namespace tlb { + struct False final : TLB { int get_size(const vm::CellSlice& cs) const override { return -1; @@ -554,23 +650,23 @@ struct FwdT final : TLB { bool skip(vm::CellSlice& cs) const override { return X.skip(cs); } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { - return X.validate(cs, weak); + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return X.validate(ops, cs, weak); } - Ref validate_fetch(vm::CellSlice& cs, bool weak = false) const override { - return X.validate_fetch(cs, weak); + Ref validate_fetch(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return X.validate_fetch(ops, cs, weak); } - Ref validate_prefetch(const vm::CellSlice& cs, bool weak = false) const override { - return X.validate_prefetch(cs, weak); + Ref validate_prefetch(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return X.validate_prefetch(ops, cs, weak); } bool extract(vm::CellSlice& cs) const override { return X.extract(cs); } - bool validate_extract(vm::CellSlice& cs, bool weak = false) const override { - return X.validate_extract(cs, weak); + bool validate_extract(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return X.validate_extract(ops, cs, weak); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return X.validate_skip(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return X.validate_skip(ops, cs, weak); } bool skip_copy(vm::CellBuilder& cb, vm::CellSlice& cs) const override { return X.skip_copy(cb, cs); @@ -665,10 +761,10 @@ struct NatLess final : TLB { int get_size(const vm::CellSlice& cs) const override { return n >= 0 ? w : -1; } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { return n >= 0 && (unsigned)cs.prefetch_ulong(w) <= (unsigned)n; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return n >= 0 && (unsigned)cs.fetch_ulong(w) <= (unsigned)n; } unsigned long long as_uint(const vm::CellSlice& cs) const override { @@ -688,10 +784,10 @@ struct NatLeq final : TLB { int get_size(const vm::CellSlice& cs) const override { return n >= 0 ? w : -1; } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { return n >= 0 && (unsigned)cs.prefetch_ulong(w) <= (unsigned)n; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { return n >= 0 && (unsigned)cs.fetch_ulong(w) <= (unsigned)n; } unsigned long long as_uint(const vm::CellSlice& cs) const override { @@ -710,7 +806,7 @@ struct TupleT final : TLB_Complex { TupleT(int _n, const TLB& _X) : n(_n), X(_X) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return 0; } @@ -725,8 +821,8 @@ struct CondT final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return !n || X.skip(cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return !n || (n > 0 && X.validate_skip(cs, weak)); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return !n || (n > 0 && X.validate_skip(ops, cs, weak)); } int get_tag(const vm::CellSlice& cs) const override { return 0; @@ -747,8 +843,8 @@ struct Cond final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return !n || field_type.skip(cs); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return !n || (n > 0 && field_type.validate_skip(cs, weak)); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return !n || (n > 0 && field_type.validate_skip(ops, cs, weak)); } int get_tag(const vm::CellSlice& cs) const override { return 0; @@ -844,7 +940,7 @@ struct Maybe : TLB_Complex { Maybe(Args... args) : field_type(args...) { } bool skip(vm::CellSlice& cs) const override; - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override; int get_tag(const vm::CellSlice& cs) const override { return cs.have(1) ? (int)cs.prefetch_ulong(1) : -1; } @@ -867,10 +963,10 @@ bool Maybe::skip(vm::CellSlice& cs) const { } template -bool Maybe::validate_skip(vm::CellSlice& cs, bool weak) const { +bool Maybe::validate_skip(int* ops, vm::CellSlice& cs, bool weak) const { int t = get_tag(cs); if (t > 0) { - return cs.advance(1) && field_type.validate_skip(cs, weak); + return cs.advance(1) && field_type.validate_skip(ops, cs, weak); } else if (!t) { return cs.advance(1); } else { @@ -918,11 +1014,11 @@ struct RefTo final : TLB { int get_size(const vm::CellSlice& cs) const override { return 0x10000; } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { - return cs.size_refs() ? ref_type.validate_ref(cs.prefetch_ref(), weak) : false; + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return cs.size_refs() ? ref_type.validate_ref(ops, cs.prefetch_ref(), weak) : false; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return ref_type.validate_skip_ref(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return ref_type.validate_skip_ref(ops, cs, weak); } std::ostream& print_type(std::ostream& os) const override { return os << '^' << ref_type; @@ -939,11 +1035,11 @@ struct RefT final : TLB { int get_size(const vm::CellSlice& cs) const override { return 0x10000; } - bool validate(const vm::CellSlice& cs, bool weak = false) const override { - return X.validate_ref(cs.prefetch_ref(), weak); + bool validate(int* ops, const vm::CellSlice& cs, bool weak = false) const override { + return X.validate_ref(ops, cs.prefetch_ref(), weak); } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return X.validate_skip_ref(cs, weak); + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return X.validate_skip_ref(ops, cs, weak); } std::ostream& print_type(std::ostream& os) const override { return os << '^' << X; @@ -960,9 +1056,10 @@ struct Either final : TLB_Complex { bool skip(vm::CellSlice& cs) const override { return cs.have(1) ? (cs.fetch_ulong(1) ? right_type.skip(cs) : left_type.skip(cs)) : false; } - bool validate_skip(vm::CellSlice& cs, bool weak = false) const override { - return cs.have(1) ? (cs.fetch_ulong(1) ? right_type.validate_skip(cs, weak) : left_type.validate_skip(cs, weak)) - : false; + bool validate_skip(int* ops, vm::CellSlice& cs, bool weak = false) const override { + return cs.have(1) + ? (cs.fetch_ulong(1) ? right_type.validate_skip(ops, cs, weak) : left_type.validate_skip(ops, cs, weak)) + : false; } int get_tag(const vm::CellSlice& cs) const override { return (int)cs.prefetch_ulong(1); diff --git a/submodules/ton/tonlib-src/crypto/vm/arithops.cpp b/submodules/ton/tonlib-src/crypto/vm/arithops.cpp index 19279cf167..25b6735386 100644 --- a/submodules/ton/tonlib-src/crypto/vm/arithops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/arithops.cpp @@ -14,15 +14,15 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include "vm/arithops.h" #include "vm/log.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" +#include "vm/vm.h" #include "common/bigint.hpp" #include "common/refint.h" @@ -389,7 +389,7 @@ int exec_muldivmod(VmState* st, unsigned args, int quiet) { auto x = stack.pop_int(); typename td::BigInt256::DoubleInt tmp{0}; tmp.add_mul(*x, *y); - auto q = td::RefInt256{true}; + auto q = td::make_refint(); tmp.mod_div(*z, q.unique_write(), round_mode); switch ((args >> 2) & 3) { case 1: @@ -401,7 +401,7 @@ int exec_muldivmod(VmState* st, unsigned args, int quiet) { stack.push_int_quiet(std::move(q), quiet); // fallthrough case 2: - stack.push_int_quiet(td::RefInt256{true, tmp}, quiet); + stack.push_int_quiet(td::make_refint(tmp), quiet); break; } return 0; @@ -450,17 +450,17 @@ int exec_mulshrmod(VmState* st, unsigned args, int mode) { switch ((args >> 2) & 3) { case 1: tmp.rshift(z, round_mode).normalize(); - stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1); + stack.push_int_quiet(td::make_refint(tmp), mode & 1); break; case 3: { typename td::BigInt256::DoubleInt tmp2{tmp}; tmp2.rshift(z, round_mode).normalize(); - stack.push_int_quiet(td::RefInt256{true, tmp2}, mode & 1); + stack.push_int_quiet(td::make_refint(tmp2), mode & 1); } // fallthrough case 2: tmp.mod_pow2(z, round_mode).normalize(); - stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1); + stack.push_int_quiet(td::make_refint(tmp), mode & 1); break; } return 0; @@ -524,24 +524,24 @@ int exec_shldivmod(VmState* st, unsigned args, int mode) { tmp <<= y; switch ((args >> 2) & 3) { case 1: { - auto q = td::RefInt256{true}; + auto q = td::make_refint(); tmp.mod_div(*z, q.unique_write(), round_mode); q.unique_write().normalize(); stack.push_int_quiet(std::move(q), mode & 1); break; } case 3: { - auto q = td::RefInt256{true}; + auto q = td::make_refint(); tmp.mod_div(*z, q.unique_write(), round_mode); q.unique_write().normalize(); stack.push_int_quiet(std::move(q), mode & 1); - stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1); + stack.push_int_quiet(td::make_refint(tmp), mode & 1); break; } case 2: { typename td::BigInt256::DoubleInt tmp2; tmp.mod_div(*z, tmp2, round_mode); - stack.push_int_quiet(td::RefInt256{true, tmp}, mode & 1); + stack.push_int_quiet(td::make_refint(tmp), mode & 1); break; } } @@ -740,7 +740,7 @@ int exec_bitsize(VmState* st, bool sgnd, bool quiet) { } else if (!quiet) { throw VmError{Excno::range_chk, "CHKSIZE for negative integer"}; } else { - stack.push_int_quiet(td::RefInt256{true}, quiet); + stack.push_int_quiet(td::make_refint(), quiet); } return 0; } diff --git a/submodules/ton/tonlib-src/crypto/vm/cellops.cpp b/submodules/ton/tonlib-src/crypto/vm/cellops.cpp index 5346e16851..cc1102846e 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cellops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cellops.cpp @@ -14,16 +14,16 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include "vm/cellops.h" #include "vm/log.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" #include "vm/vmstate.h" +#include "vm/vm.h" #include "common/bigint.hpp" #include "common/refint.h" @@ -814,6 +814,9 @@ void register_cell_serialize_ops(OpcodeTable& cp0) { compute_len_store_const_ref)) .insert(OpcodeInstr::mksimple(0xcf23, 16, "ENDXC", exec_builder_to_special_cell)) .insert(OpcodeInstr::mkfixed(0xcf28 >> 2, 14, 2, dump_store_le_int, exec_store_le_int)) + .insert(OpcodeInstr::mksimple( + 0xcf30, 16, "BDEPTH", + std::bind(exec_int_builder_func, _1, "BDEPTH", [](Ref b) { return b->get_depth(); }))) .insert(OpcodeInstr::mksimple( 0xcf31, 16, "BBITS", std::bind(exec_int_builder_func, _1, "BBITS", [](Ref b) { return b->size(); }))) @@ -1321,6 +1324,22 @@ int exec_load_same(VmState* st, const char* name, int x) { return 0; } +int exec_cell_depth(VmState* st) { + Stack& stack = st->get_stack(); + VM_LOG(st) << "execute CDEPTH"; + auto cell = stack.pop_maybe_cell(); + stack.push_smallint(cell.not_null() ? cell->get_depth() : 0); + return 0; +} + +int exec_slice_depth(VmState* st) { + Stack& stack = st->get_stack(); + VM_LOG(st) << "execute SDEPTH"; + auto cs = stack.pop_cellslice(); + stack.push_smallint(cs->get_depth()); + return 0; +} + void register_cell_deserialize_ops(OpcodeTable& cp0) { using namespace std::placeholders; cp0.insert(OpcodeInstr::mksimple(0xd0, 8, "CTOS", exec_cell_to_slice)) @@ -1407,7 +1426,9 @@ void register_cell_deserialize_ops(OpcodeTable& cp0) { .insert(OpcodeInstr::mkfixed(0xd75, 12, 4, dump_load_le_int, exec_load_le_int)) .insert(OpcodeInstr::mksimple(0xd760, 16, "LDZEROES", std::bind(exec_load_same, _1, "LDZEROES", 0))) .insert(OpcodeInstr::mksimple(0xd761, 16, "LDONES", std::bind(exec_load_same, _1, "LDONES", 1))) - .insert(OpcodeInstr::mksimple(0xd762, 16, "LDSAME", std::bind(exec_load_same, _1, "LDSAME", -1))); + .insert(OpcodeInstr::mksimple(0xd762, 16, "LDSAME", std::bind(exec_load_same, _1, "LDSAME", -1))) + .insert(OpcodeInstr::mksimple(0xd764, 16, "SDEPTH", exec_slice_depth)) + .insert(OpcodeInstr::mksimple(0xd765, 16, "CDEPTH", exec_cell_depth)); } void register_cell_ops(OpcodeTable& cp0) { diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp index 223959bdc4..1c3fcdef8a 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/cells/CellBuilder.h" @@ -52,18 +52,26 @@ Ref CellBuilder::finalize_copy(bool special) const { } auto res = DataCell::create(data, size(), td::span(refs.data(), size_refs()), special); if (res.is_error()) { - LOG(ERROR) << res.error(); + LOG(DEBUG) << res.error(); throw CellWriteError{}; } - CHECK(res.ok().not_null()); - return res.move_as_ok(); + auto cell = res.move_as_ok(); + CHECK(cell.not_null()); + if (vm_state_interface) { + vm_state_interface->register_new_cell(cell); + if (cell.is_null()) { + LOG(DEBUG) << "cannot register new data cell"; + throw CellWriteError{}; + } + } + return cell; } Ref CellBuilder::finalize_novm(bool special) { auto res = DataCell::create(data, size(), td::mutable_span(refs.data(), size_refs()), special); bits = refs_cnt = 0; if (res.is_error()) { - LOG(ERROR) << res.error(); + LOG(DEBUG) << res.error(); throw CellWriteError{}; } CHECK(res.ok().not_null()); @@ -72,10 +80,17 @@ Ref CellBuilder::finalize_novm(bool special) { Ref CellBuilder::finalize(bool special) { auto* vm_state_interface = VmStateInterface::get(); - if (vm_state_interface) { - vm_state_interface->register_cell_create(); + if (!vm_state_interface) { + return finalize_novm(special); } - return finalize_novm(special); + vm_state_interface->register_cell_create(); + auto cell = finalize_novm(special); + vm_state_interface->register_new_cell(cell); + if (cell.is_null()) { + LOG(DEBUG) << "cannot register new data cell"; + throw CellWriteError{}; + } + return cell; } Ref CellBuilder::create_pruned_branch(Ref cell, td::uint32 new_level, td::uint32 virt_level) { @@ -87,6 +102,7 @@ Ref CellBuilder::create_pruned_branch(Ref cell, td::uint32 new_level } return do_create_pruned_branch(std::move(cell), new_level, virt_level); } + Ref CellBuilder::do_create_pruned_branch(Ref cell, td::uint32 new_level, td::uint32 virt_level) { auto level_mask = cell->get_level_mask().apply(virt_level); auto level = level_mask.get_level(); @@ -371,6 +387,14 @@ CellBuilder& CellBuilder::store_ref(Ref ref) { return ensure_pass(store_ref_bool(std::move(ref))); } +td::uint16 CellBuilder::get_depth() const { + int d = 0; + for (unsigned i = 0; i < refs_cnt; i++) { + d = std::max(d, 1 + refs[i]->get_depth()); + } + return static_cast(d); +} + bool CellBuilder::append_data_cell_bool(const DataCell& cell) { unsigned len = cell.size(); if (can_extend_by(len, cell.size_refs())) { @@ -460,6 +484,16 @@ bool CellBuilder::append_cellslice_chk(Ref cs_ref, unsigned size_ext) return cs_ref.not_null() && append_cellslice_chk(*cs_ref, size_ext); } +CellSlice CellSlice::clone() const { + CellBuilder cb; + Ref cell; + if (cb.append_cellslice_bool(*this) && cb.finalize_to(cell)) { + return CellSlice{NoVmOrd(), std::move(cell)}; + } else { + return {}; + } +} + bool CellBuilder::append_bitstring(const td::BitString& bs) { return store_bits_bool(bs.cbits(), bs.size()); } @@ -536,11 +570,11 @@ CellBuilder* CellBuilder::make_copy() const { return c; } -CellSlice CellBuilder::as_cellslice() const& { +CellSlice CellBuilder::as_cellslice() const & { return CellSlice{finalize_copy()}; } -Ref CellBuilder::as_cellslice_ref() const& { +Ref CellBuilder::as_cellslice_ref() const & { return Ref{true, finalize_copy()}; } diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h index 0095018e44..bcd2434ecf 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h +++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellBuilder.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "vm/cells/DataCell.h" @@ -78,6 +78,7 @@ class CellBuilder : public td::CntObject { const unsigned char* get_data() const { return data; } + td::uint16 get_depth() const; td::ConstBitPtr data_bits() const { return data; } @@ -85,6 +86,10 @@ class CellBuilder : public td::CntObject { return idx < refs_cnt ? refs[idx] : Ref{}; } void reset(); + bool reset_bool() { + reset(); + return true; + } CellBuilder& operator=(const CellBuilder&); CellBuilder& operator=(CellBuilder&&); CellBuilder& store_bytes(const char* str, std::size_t len); diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp index bb550a6969..0d539c74e6 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/cells/CellSlice.h" #include "vm/excno.hpp" @@ -218,6 +218,17 @@ unsigned CellSlice::get_level() const { return l; } +Ref CellSlice::get_base_cell() const { + if (cell.is_null()) { + return {}; + } + auto res = cell->virtualize(virt); + if (!tree_node.empty()) { + res = UsageCell::create(std::move(res), tree_node); + } + return res; +} + bool CellSlice::advance(unsigned bits) { if (have(bits)) { bits_st += bits; @@ -583,8 +594,7 @@ td::RefInt256 CellSlice::fetch_int256(unsigned bits, bool sgnd) { if (!have(bits)) { return {}; } else if (bits < td::BigInt256::word_shift) { - long long val = sgnd ? fetch_long(bits) : fetch_ulong(bits); - return td::RefInt256{true, val}; + return td::make_refint(sgnd ? fetch_long(bits) : fetch_ulong(bits)); } else { td::RefInt256 res{true}; res.unique_write().import_bits(data_bits(), bits, sgnd); @@ -597,8 +607,7 @@ td::RefInt256 CellSlice::prefetch_int256(unsigned bits, bool sgnd) const { if (!have(bits)) { return {}; } else if (bits < td::BigInt256::word_shift) { - long long val = sgnd ? prefetch_long(bits) : prefetch_ulong(bits); - return td::RefInt256{true, val}; + return td::make_refint(sgnd ? prefetch_long(bits) : prefetch_ulong(bits)); } else { td::RefInt256 res{true}; res.unique_write().import_bits(data_bits(), bits, sgnd); @@ -608,15 +617,15 @@ td::RefInt256 CellSlice::prefetch_int256(unsigned bits, bool sgnd) const { td::RefInt256 CellSlice::prefetch_int256_zeroext(unsigned bits, bool sgnd) const { if (bits > 256u + sgnd) { - return td::RefInt256{false}; + return td::make_refint(); } else { unsigned ld_bits = std::min(bits, size()); if (bits < td::BigInt256::word_shift) { long long val = sgnd ? prefetch_long(ld_bits) : prefetch_ulong(ld_bits); val <<= bits - ld_bits; - return td::RefInt256{true, val}; + return td::make_refint(val); } else { - td::RefInt256 res{true}; + auto res = td::make_refint(); res.unique_write().import_bits(data_bits(), ld_bits, sgnd); res <<= bits - ld_bits; return res; @@ -765,6 +774,14 @@ bool CellSlice::fetch_maybe_ref(Ref& res) { } } +td::uint16 CellSlice::get_depth() const { + int d = 0; + for (unsigned i = 0; i < size_refs(); ++i) { + d = std::max(d, prefetch_ref(i)->get_depth() + 1); + } + return static_cast(d); +} + bool CellSlice::begins_with(unsigned bits, unsigned long long value) const { return have(bits) && !((prefetch_ulong(bits) ^ value) & ((1ULL << bits) - 1)); } @@ -969,13 +986,18 @@ void CellSlice::dump_hex(std::ostream& os, int mode, bool endl) const { } } -void CellSlice::print_rec(std::ostream& os, int indent) const { +bool CellSlice::print_rec(std::ostream& os, int* limit, int indent) const { for (int i = 0; i < indent; i++) { os << ' '; } + if (!limit || *limit <= 0) { + os << "" << std::endl; + return false; + } + --*limit; if (cell.is_null()) { os << "NULL" << std::endl; - return; + return true; } if (is_special()) { os << "SPECIAL "; @@ -983,8 +1005,20 @@ void CellSlice::print_rec(std::ostream& os, int indent) const { os << "x{" << as_bitslice().to_hex() << '}' << std::endl; for (unsigned i = 0; i < size_refs(); i++) { CellSlice cs{NoVm(), prefetch_ref(i)}; - cs.print_rec(os, indent + 1); + if (!cs.print_rec(os, limit, indent + 1)) { + return false; + } } + return true; +} + +bool CellSlice::print_rec(std::ostream& os, int indent) const { + int limit = default_recursive_print_limit; + return print_rec(os, &limit, indent); +} + +bool CellSlice::print_rec(int limit, std::ostream& os, int indent) const { + return print_rec(os, &limit, indent); } td::StringBuilder& operator<<(td::StringBuilder& sb, const CellSlice& cs) { @@ -1015,7 +1049,7 @@ std::ostream& operator<<(std::ostream& os, Ref cs_ref) { VirtualCell::LoadedCell load_cell_slice_impl(const Ref& cell, bool* can_be_special) { auto* vm_state_interface = VmStateInterface::get(); if (vm_state_interface) { - vm_state_interface->register_cell_load(); + vm_state_interface->register_cell_load(cell->get_hash()); } auto r_loaded_cell = cell->load_cell(); if (r_loaded_cell.is_error()) { diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h index 433344f982..a2e528d685 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h +++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellSlice.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -44,6 +44,7 @@ class CellSlice : public td::CntObject { public: static constexpr long long fetch_long_eof = (static_cast(-1LL) << 63); static constexpr unsigned long long fetch_ulong_eof = (unsigned long long)-1LL; + enum { default_recursive_print_limit = 100 }; struct CellReadError {}; CellSlice(NoVm, Ref cell_ref); @@ -129,6 +130,7 @@ class CellSlice : public td::CntObject { const unsigned char* data() const { return cell->get_data(); } + td::uint16 get_depth() const; td::ConstBitPtr data_bits() const { return td::ConstBitPtr{data(), (int)cur_pos()}; } @@ -137,6 +139,7 @@ class CellSlice : public td::CntObject { } unsigned get_cell_level() const; unsigned get_level() const; + Ref get_base_cell() const; // be careful with this one! int fetch_octet(); int prefetch_octet() const; unsigned long long prefetch_ulong_top(unsigned& bits) const; @@ -251,7 +254,9 @@ class CellSlice : public td::CntObject { bool contents_equal(const CellSlice& cs2) const; void dump(std::ostream& os, int level = 0, bool endl = true) const; void dump_hex(std::ostream& os, int mode = 0, bool endl = false) const; - void print_rec(std::ostream& os, int indent = 0) const; + bool print_rec(std::ostream& os, int indent = 0) const; + bool print_rec(std::ostream& os, int* limit, int indent = 0) const; + bool print_rec(int limit, std::ostream& os, int indent = 0) const; void error() const { throw CellReadError{}; } @@ -274,6 +279,7 @@ class CellSlice : public td::CntObject { offs = std::min(offs, size()); return CellSlice{*this, size() - offs, size_refs(), offs, 0}; } + CellSlice clone() const; private: void init_bits_refs(); diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp index ad2cbf5f8f..9889dc8e2b 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.cpp @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ #include "CellString.h" #include "td/utils/misc.h" @@ -61,4 +79,79 @@ td::Result CellString::load(CellSlice &cs, unsigned int top_bits) { CHECK(to.offs == (int)size); return res; } + +td::Status CellText::store(CellBuilder &cb, td::Slice slice, unsigned int top_bits) { + td::uint32 size = td::narrow_cast(slice.size() * 8); + return store(cb, td::BitSlice(slice.ubegin(), size), top_bits); +} + +td::Status CellText::store(CellBuilder &cb, td::BitSlice slice, unsigned int top_bits) { + if (slice.size() > max_bytes * 8) { + return td::Status::Error("String is too long (1)"); + } + if (cb.remaining_bits() < 16) { + return td::Status::Error("Not enough space in a builder"); + } + if (top_bits < 16) { + return td::Status::Error("Need at least 16 top bits"); + } + if (slice.size() == 0) { + cb.store_long(0, 8); + return td::Status::OK(); + } + unsigned int head = td::min(slice.size(), td::min(cb.remaining_bits(), top_bits) - 16) / 8 * 8; + auto max_bits = vm::Cell::max_bits / 8 * 8; + auto depth = 1 + (slice.size() - head + max_bits - 8 - 1) / (max_bits - 8); + if (depth > max_chain_length) { + return td::Status::Error("String is too long (2)"); + } + cb.store_long(depth, 8); + cb.store_long(head / 8, 8); + cb.append_bitslice(slice.subslice(0, head)); + slice.advance(head); + if (slice.size() == 0) { + return td::Status::OK(); + } + cb.store_ref(do_store(std::move(slice))); + return td::Status::OK(); +} + +td::Ref CellText::do_store(td::BitSlice slice) { + vm::CellBuilder cb; + unsigned int head = td::min(slice.size(), cb.remaining_bits() - 8) / 8 * 8; + cb.store_long(head / 8, 8); + cb.append_bitslice(slice.subslice(0, head)); + slice.advance(head); + if (slice.size() != 0) { + cb.store_ref(do_store(std::move(slice))); + } + return cb.finalize(); +} + +template +void CellText::for_each(F &&f, CellSlice cs) { + auto depth = cs.fetch_ulong(8); + + for (td::uint32 i = 0; i < depth; i++) { + auto size = cs.fetch_ulong(8); + f(cs.fetch_bits(td::narrow_cast(size) * 8)); + if (i + 1 < depth) { + cs = vm::load_cell_slice(cs.prefetch_ref()); + } + } +} + +td::Result CellText::load(CellSlice &cs) { + unsigned int size = 0; + for_each([&](auto slice) { size += slice.size(); }, cs); + if (size % 8 != 0) { + return td::Status::Error("Size is not divisible by 8"); + } + std::string res(size / 8, 0); + + td::BitPtr to(td::MutableSlice(res).ubegin()); + for_each([&](auto slice) { to.concat(slice); }, cs); + CHECK(to.offs == (int)size); + return res; +} } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h index 89c933d876..ab93203f88 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h +++ b/submodules/ton/tonlib-src/crypto/vm/cells/CellString.h @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ #pragma once #include "td/utils/Status.h" @@ -13,10 +31,35 @@ class CellString { static td::Status store(CellBuilder &cb, td::Slice slice, unsigned int top_bits = Cell::max_bits); static td::Status store(CellBuilder &cb, td::BitSlice slice, unsigned int top_bits = Cell::max_bits); static td::Result load(CellSlice &cs, unsigned int top_bits = Cell::max_bits); + static td::Result> create(td::Slice slice, unsigned int top_bits = Cell::max_bits) { + vm::CellBuilder cb; + TRY_STATUS(store(cb, slice, top_bits)); + return cb.finalize(); + } private: template static void for_each(F &&f, CellSlice &cs, unsigned int top_bits = Cell::max_bits); }; +class CellText { + public: + static constexpr unsigned int max_bytes = 1024; + static constexpr unsigned int max_chain_length = 16; + + static td::Status store(CellBuilder &cb, td::Slice slice, unsigned int top_bits = Cell::max_bits); + static td::Status store(CellBuilder &cb, td::BitSlice slice, unsigned int top_bits = Cell::max_bits); + static td::Result load(CellSlice &cs); + static td::Result> create(td::Slice slice, unsigned int top_bits = Cell::max_bits) { + vm::CellBuilder cb; + TRY_STATUS(store(cb, slice, top_bits)); + return cb.finalize(); + } + + private: + template + static void for_each(F &&f, CellSlice cs); + static td::Ref do_store(td::BitSlice slice); +}; + } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp index a373e80468..105c74c167 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.cpp @@ -143,19 +143,80 @@ Ref MerkleProof::virtualize(Ref cell, int virtualization) { return virtualize_raw(r_raw.move_as_ok(), {0 /*level*/, static_cast(virtualization)}); } +class MerkleProofCombineFast { + public: + MerkleProofCombineFast(Ref a, Ref b) : a_(std::move(a)), b_(std::move(b)) { + } + td::Result> run() { + TRY_RESULT_ASSIGN(a_, unpack_proof(a_)); + TRY_RESULT_ASSIGN(b_, unpack_proof(b_)); + TRY_RESULT(res, run_raw()); + return CellBuilder::create_merkle_proof(std::move(res)); + } + + td::Result> run_raw() { + if (a_->get_hash(0) != b_->get_hash(0)) { + return td::Status::Error("Can't combine MerkleProofs with different roots"); + } + return merge(a_, b_, 0); + } + + private: + Ref a_; + Ref b_; + + Ref merge(Ref a, Ref b, td::uint32 merkle_depth) { + if (a->get_hash() == b->get_hash()) { + return a; + } + if (a->get_level() == merkle_depth) { + return a; + } + if (b->get_level() == merkle_depth) { + return b; + } + + CellSlice csa(NoVm(), a); + CellSlice csb(NoVm(), b); + + if (csa.is_special() && csa.special_type() == vm::Cell::SpecialType::PrunnedBranch) { + return b; + } + if (csb.is_special() && csb.special_type() == vm::Cell::SpecialType::PrunnedBranch) { + return a; + } + + CHECK(csa.size_refs() != 0); + + auto child_merkle_depth = csa.child_merkle_depth(merkle_depth); + + CellBuilder cb; + cb.store_bits(csa.fetch_bits(csa.size())); + for (unsigned i = 0; i < csa.size_refs(); i++) { + cb.store_ref(merge(csa.prefetch_ref(i), csb.prefetch_ref(i), child_merkle_depth)); + } + return cb.finalize(csa.is_special()); + } +}; + class MerkleProofCombine { public: MerkleProofCombine(Ref a, Ref b) : a_(std::move(a)), b_(std::move(b)) { } td::Result> run() { - TRY_RESULT(a, unpack_proof(a_)); - TRY_RESULT(b, unpack_proof(b_)); - if (a->get_hash(0) != b->get_hash(0)) { + TRY_RESULT_ASSIGN(a_, unpack_proof(a_)); + TRY_RESULT_ASSIGN(b_, unpack_proof(b_)); + TRY_RESULT(res, run_raw()); + return CellBuilder::create_merkle_proof(std::move(res)); + } + + td::Result> run_raw() { + if (a_->get_hash(0) != b_->get_hash(0)) { return td::Status::Error("Can't combine MerkleProofs with different roots"); } - dfs(a, 0); - dfs(b, 0); - return CellBuilder::create_merkle_proof(create_A(a, 0, 0)); + dfs(a_, 0); + dfs(b_, 0); + return create_A(a_, 0, 0); } private: @@ -262,6 +323,30 @@ Ref MerkleProof::combine(Ref a, Ref b) { return res.move_as_ok(); } +Ref MerkleProof::combine_fast(Ref a, Ref b) { + auto res = MerkleProofCombineFast(std::move(a), std::move(b)).run(); + if (res.is_error()) { + return {}; + } + return res.move_as_ok(); +} + +Ref MerkleProof::combine_raw(Ref a, Ref b) { + auto res = MerkleProofCombine(std::move(a), std::move(b)).run_raw(); + if (res.is_error()) { + return {}; + } + return res.move_as_ok(); +} + +Ref MerkleProof::combine_fast_raw(Ref a, Ref b) { + auto res = MerkleProofCombineFast(std::move(a), std::move(b)).run_raw(); + if (res.is_error()) { + return {}; + } + return res.move_as_ok(); +} + MerkleProofBuilder::MerkleProofBuilder(Ref root) : usage_tree(std::make_shared()), orig_root(std::move(root)) { usage_root = UsageCell::create(orig_root, usage_tree->root_ptr()); diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h index 5b3b8ebcef..41788c5f7f 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h +++ b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleProof.h @@ -38,12 +38,15 @@ class MerkleProof { static Ref virtualize(Ref cell, int virtualization); static Ref combine(Ref a, Ref b); + static Ref combine_fast(Ref a, Ref b); // works with upwrapped proofs // works fine with cell of non-zero level, but this is not supported (yet?) in MerkeProof special cell static Ref generate_raw(Ref cell, IsPrunnedFunction is_prunned); static Ref generate_raw(Ref cell, CellUsageTree *usage_tree); static Ref virtualize_raw(Ref cell, Cell::VirtualizationParameters virt); + static Ref combine_raw(Ref a, Ref b); + static Ref combine_fast_raw(Ref a, Ref b); }; class MerkleProofBuilder { diff --git a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp index 30b5116ecf..d75f16675e 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cells/MerkleUpdate.cpp @@ -268,7 +268,7 @@ class MerkleCombine { // 1. Create maximum subtrees of X and Z with all cells in A, B, C and D // Max(V) - such maximum subtree // - // 2. Max(A) and Max(D) should be merkle update already. But win want to minimize it + // 2. Max(A) and Max(D) should be merkle update already. But we want to minimize it // So we cut all branches of Max(D) which are in maxA // When we cut branch q in Max(D) we mark some path to q in Max(A) // Then we cut all branches of Max(A) which are not marked. diff --git a/submodules/ton/tonlib-src/crypto/vm/continuation.cpp b/submodules/ton/tonlib-src/crypto/vm/continuation.cpp index d4952769a5..243dfd5ea0 100644 --- a/submodules/ton/tonlib-src/crypto/vm/continuation.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/continuation.cpp @@ -14,12 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/dispatch.h" #include "vm/continuation.h" #include "vm/dict.h" #include "vm/log.h" +#include "vm/vm.h" +#include "vm/vmstate.h" namespace vm { @@ -32,6 +34,17 @@ bool Continuation::has_c0() const { return cont_data && cont_data->save.c[0].not_null(); } +bool ControlRegs::clear() { + for (unsigned i = 0; i < creg_num; i++) { + c[i].clear(); + } + for (unsigned i = 0; i < dreg_num; i++) { + d[i].clear(); + } + c7.clear(); + return true; +} + StackEntry ControlRegs::get(unsigned idx) const { if (idx < creg_num) { return get_c(idx); @@ -107,6 +120,155 @@ ControlRegs& ControlRegs::operator&=(const ControlRegs& save) { return *this; } +bool ControlRegs::serialize(CellBuilder& cb) const { + // _ cregs:(HashmapE 4 VmStackValue) = VmSaveList; + Dictionary dict{4}; + CellBuilder cb2; + for (int i = 0; i < creg_num; i++) { + if (c[i].not_null() && + !(StackEntry{c[i]}.serialize(cb2) && dict.set_builder(td::BitArray<4>(i), cb2) && cb2.reset_bool())) { + return false; + } + } + for (int i = 0; i < dreg_num; i++) { + if (d[i].not_null() && !(StackEntry{d[i]}.serialize(cb2) && dict.set_builder(td::BitArray<4>(dreg_idx + i), cb2) && + cb2.reset_bool())) { + return false; + } + } + return (c7.is_null() || (StackEntry{c7}.serialize(cb2) && dict.set_builder(td::BitArray<4>(7), cb2))) && + std::move(dict).append_dict_to_bool(cb); +} + +bool ControlRegs::deserialize(CellSlice& cs, int mode) { + // _ cregs:(HashmapE 4 VmStackValue) = VmSaveList; + Ref root; + return cs.fetch_maybe_ref(root) && deserialize(std::move(root), mode); +} + +bool ControlRegs::deserialize(Ref root, int mode) { + try { + clear(); + Dictionary dict{std::move(root), 4}; + return dict.check_for_each([this, mode](Ref val, td::ConstBitPtr key, int n) { + StackEntry value; + return value.deserialize(val.write(), mode) && val->empty_ext() && set((int)key.get_uint(4), std::move(value)); + }); + } catch (VmError&) { + return false; + } +} + +bool ControlData::clear() { + stack.clear(); + save.clear(); + nargs = cp = -1; + return true; +} + +bool ControlData::serialize(CellBuilder& cb) const { + // vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList + // cp:(Maybe int16) = VmControlData; + return cb.store_bool_bool(nargs >= 0) // vm_ctl_data$_ nargs:(Maybe ... + && (nargs < 0 || cb.store_long_bool(nargs, 13)) // ... int13) + && cb.store_bool_bool(stack.not_null()) // stack:(Maybe ... + && (stack.is_null() || stack->serialize(cb)) // ... VmStack) + && save.serialize(cb) // save:VmSaveList + && cb.store_bool_bool(cp != -1) // cp:(Maybe ... + && (cp == -1 || cb.store_long_bool(cp, 16)); // ... int16) +} + +bool ControlData::deserialize(CellSlice& cs, int mode) { + // vm_ctl_data$_ nargs:(Maybe uint13) stack:(Maybe VmStack) save:VmSaveList + // cp:(Maybe int16) = VmControlData; + nargs = cp = -1; + stack.clear(); + bool f; + return cs.fetch_bool_to(f) && (!f || cs.fetch_uint_to(13, nargs)) // nargs:(Maybe uint13) + && cs.fetch_bool_to(f) && (!f || Stack::deserialize_to(cs, stack, mode)) // stack:(Maybe VmStack) + && save.deserialize(cs, mode) // save:VmSaveList + && cs.fetch_bool_to(f) && (!f || (cs.fetch_int_to(16, cp) && cp != -1)); // cp:(Maybe int16) +} + +bool Continuation::serialize_ref(CellBuilder& cb) const { + auto* vsi = VmStateInterface::get(); + if (vsi && !vsi->register_op()) { + return false; + } + vm::CellBuilder cb2; + return serialize(cb2) && cb.store_ref_bool(cb2.finalize()); +} + +Ref Continuation::deserialize(CellSlice& cs, int mode) { + if (mode & 0x1002) { + return {}; + } + auto* vsi = VmStateInterface::get(); + if (vsi && !vsi->register_op()) { + return {}; + } + + mode |= 0x1000; + switch (cs.bselect_ext(6, 0x100f011100010001ULL)) { + case 0: + // vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont; + return OrdCont::deserialize(cs, mode); + case 1: + // vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont; + return ArgContExt::deserialize(cs, mode); + case 2: + // vmc_quit$1000 exit_code:int32 = VmCont; + return QuitCont::deserialize(cs, mode); + case 3: + // vmc_quit_exc$1001 = VmCont; + return ExcQuitCont::deserialize(cs, mode); + case 4: + // vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont; + return RepeatCont::deserialize(cs, mode); + case 5: + // vmc_until$110000 body:^VmCont after:^VmCont = VmCont; + return UntilCont::deserialize(cs, mode); + case 6: + // vmc_again$110001 body:^VmCont = VmCont; + return AgainCont::deserialize(cs, mode); + case 7: + // vmc_while_cond$110010 cond:^VmCont body:^VmCont after:^VmCont = VmCont; + return WhileCont::deserialize(cs, mode | 0x2000); + case 8: + // vmc_while_body$110011 cond:^VmCont body:^VmCont after:^VmCont = VmCont; + return WhileCont::deserialize(cs, mode & ~0x2000); + case 9: + // vmc_pushint$1111 value:int32 next:^VmCont = VmCont; + return PushIntCont::deserialize(cs, mode); + default: + return {}; + } +} + +bool Continuation::deserialize_to(Ref cell, Ref& cont, int mode) { + if (cell.is_null()) { + cont.clear(); + return false; + } + CellSlice cs = load_cell_slice(std::move(cell)); + return deserialize_to(cs, cont, mode & ~0x1000) && cs.empty_ext(); +} + +bool QuitCont::serialize(CellBuilder& cb) const { + // vmc_quit$1000 exit_code:int32 = VmCont; + return cb.store_long_bool(8, 4) && cb.store_long_bool(exit_code, 32); +} + +Ref QuitCont::deserialize(CellSlice& cs, int mode) { + // vmc_quit$1000 exit_code:int32 = VmCont; + int exit_code; + if (cs.fetch_ulong(4) == 8 && cs.fetch_int_to(32, exit_code)) { + return Ref{true, exit_code}; + } else { + return {}; + } +} + int ExcQuitCont::jump(VmState* st) const & { int n = 0; try { @@ -118,6 +280,16 @@ int ExcQuitCont::jump(VmState* st) const & { return ~n; } +bool ExcQuitCont::serialize(CellBuilder& cb) const { + // vmc_quit_exc$1001 = VmCont; + return cb.store_long_bool(9, 4); +} + +Ref ExcQuitCont::deserialize(CellSlice& cs, int mode) { + // vmc_quit_exc$1001 = VmCont; + return cs.fetch_ulong(4) == 9 ? Ref{true} : Ref{}; +} + int PushIntCont::jump(VmState* st) const & { VM_LOG(st) << "execute implicit PUSH " << push_val << " (slow)"; st->get_stack().push_smallint(push_val); @@ -130,6 +302,24 @@ int PushIntCont::jump_w(VmState* st) & { return st->jump(std::move(next)); } +bool PushIntCont::serialize(CellBuilder& cb) const { + // vmc_pushint$1111 value:int32 next:^VmCont = VmCont; + return cb.store_long_bool(15, 4) && cb.store_long_bool(push_val, 32) && next->serialize_ref(cb); +} + +Ref PushIntCont::deserialize(CellSlice& cs, int mode) { + // vmc_pushint$1111 value:int32 next:^VmCont = VmCont; + int value; + Ref ref; + Ref next; + if (cs.fetch_ulong(4) == 15 && cs.fetch_int_to(32, value) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), next, mode)) { + return Ref{true, value, std::move(next)}; + } else { + return {}; + } +} + int ArgContExt::jump(VmState* st) const & { st->adjust_cr(data.save); if (data.cp != -1) { @@ -146,6 +336,23 @@ int ArgContExt::jump_w(VmState* st) & { return st->jump_to(std::move(ext)); } +bool ArgContExt::serialize(CellBuilder& cb) const { + // vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont; + return cb.store_long_bool(1, 2) && data.serialize(cb) && ext->serialize_ref(cb); +} + +Ref ArgContExt::deserialize(CellSlice& cs, int mode) { + // vmc_envelope$01 cdata:VmControlData next:^VmCont = VmCont; + ControlData cdata; + Ref ref; + Ref next; + mode &= ~0x1000; + return cs.fetch_ulong(2) == 1 && cdata.deserialize(cs, mode) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), next, mode) + ? Ref{true, std::move(next), std::move(cdata)} + : Ref{}; +} + int RepeatCont::jump(VmState* st) const & { VM_LOG(st) << "repeat " << count << " more times (slow)\n"; if (count <= 0) { @@ -174,6 +381,26 @@ int RepeatCont::jump_w(VmState* st) & { return st->jump(body); } +bool RepeatCont::serialize(CellBuilder& cb) const { + // vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont; + return cb.store_long_bool(0x14, 5) && cb.store_long_bool(count, 63) && body->serialize_ref(cb) && + after->serialize_ref(cb); +} + +Ref RepeatCont::deserialize(CellSlice& cs, int mode) { + // vmc_repeat$10100 count:uint63 body:^VmCont after:^VmCont = VmCont; + long long count; + Ref ref; + Ref body, after; + if (cs.fetch_ulong(5) == 0x14 && cs.fetch_uint_to(63, count) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), body, mode) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), after, mode)) { + return Ref{true, std::move(body), std::move(after), count}; + } else { + return {}; + } +} + int VmState::repeat(Ref body, Ref after, long long count) { if (count <= 0) { body.clear(); @@ -201,6 +428,22 @@ int AgainCont::jump_w(VmState* st) & { } } +bool AgainCont::serialize(CellBuilder& cb) const { + // vmc_again$110001 body:^VmCont = VmCont; + return cb.store_long_bool(0x31, 6) && body->serialize_ref(cb); +} + +Ref AgainCont::deserialize(CellSlice& cs, int mode) { + // vmc_again$110001 body:^VmCont = VmCont; + Ref ref; + Ref body; + if (cs.fetch_ulong(6) == 0x31 && cs.fetch_ref_to(ref) && deserialize_to(std::move(ref), body, mode)) { + return Ref{true, std::move(body)}; + } else { + return {}; + } +} + int VmState::again(Ref body) { return jump(Ref{true, std::move(body)}); } @@ -233,6 +476,23 @@ int UntilCont::jump_w(VmState* st) & { } } +bool UntilCont::serialize(CellBuilder& cb) const { + // vmc_until$110000 body:^VmCont after:^VmCont = VmCont; + return cb.store_long_bool(0x30, 6) && body->serialize_ref(cb) && after->serialize_ref(cb); +} + +Ref UntilCont::deserialize(CellSlice& cs, int mode) { + // vmc_until$110000 body:^VmCont after:^VmCont = VmCont; + Ref ref; + Ref body, after; + if (cs.fetch_ulong(6) == 0x30 && cs.fetch_ref_to(ref) && deserialize_to(std::move(ref), body, mode) && + cs.fetch_ref_to(ref) && deserialize_to(std::move(ref), after, mode)) { + return Ref{true, std::move(body), std::move(after)}; + } else { + return {}; + } +} + int VmState::until(Ref body, Ref after) { if (!body->has_c0()) { set_c0(Ref{true, body, std::move(after)}); @@ -292,6 +552,29 @@ int WhileCont::jump_w(VmState* st) & { } } +bool WhileCont::serialize(CellBuilder& cb) const { + // vmc_while_cond$110010 cond:^VmCont body:^VmCont after:^VmCont = VmCont; + // vmc_while_body$110011 cond:^VmCont body:^VmCont after:^VmCont = VmCont; + return cb.store_long_bool(0x19, 5) && cb.store_bool_bool(!chkcond) && cond->serialize_ref(cb) && + body->serialize_ref(cb) && after->serialize_ref(cb); +} + +Ref WhileCont::deserialize(CellSlice& cs, int mode) { + // vmc_while_cond$110010 cond:^VmCont body:^VmCont after:^VmCont = VmCont; + // vmc_while_body$110011 cond:^VmCont body:^VmCont after:^VmCont = VmCont; + bool at_body; + Ref ref; + Ref cond, body, after; + if (cs.fetch_ulong(5) == 0x19 && cs.fetch_bool_to(at_body) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), cond, mode) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), body, mode) && cs.fetch_ref_to(ref) && + deserialize_to(std::move(ref), after, mode)) { + return Ref{true, std::move(cond), std::move(body), std::move(after), !at_body}; + } else { + return {}; + } +} + int VmState::loop_while(Ref cond, Ref body, Ref after) { if (!cond->has_c0()) { set_c0(Ref{true, cond, std::move(body), std::move(after), true}); @@ -311,6 +594,22 @@ int OrdCont::jump_w(VmState* st) & { return 0; } +bool OrdCont::serialize(CellBuilder& cb) const { + // vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont; + return cb.store_long_bool(0, 2) && data.serialize(cb) && StackEntry{code}.serialize(cb, 0x1000); +} + +Ref OrdCont::deserialize(CellSlice& cs, int mode) { + // vmc_std$00 cdata:VmControlData code:VmCellSlice = VmCont; + ControlData cdata; + StackEntry val; + mode &= ~0x1000; + return cs.fetch_ulong(2) == 0 && cdata.deserialize(cs, mode) && val.deserialize(cs, 0x4000) && + val.is(StackEntry::t_slice) + ? Ref{true, std::move(val).as_slice(), std::move(cdata)} + : Ref{}; +} + void VmState::init_cregs(bool same_c3, bool push_0) { cr.set_c0(quit0); cr.set_c1(quit1); @@ -337,555 +636,4 @@ void VmState::init_cregs(bool same_c3, bool push_0) { } } -VmState::VmState() : cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) { - ensure_throw(init_cp(0)); - init_cregs(); -} - -VmState::VmState(Ref _code) - : code(std::move(_code)), cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) { - ensure_throw(init_cp(0)); - init_cregs(); -} - -VmState::VmState(Ref _code, Ref _stack, int flags, Ref _data, VmLog log, - std::vector> _libraries, Ref init_c7) - : code(std::move(_code)) - , stack(std::move(_stack)) - , cp(-1) - , dispatch(&dummy_dispatch_table) - , quit0(true, 0) - , quit1(true, 1) - , log(log) - , libraries(std::move(_libraries)) { - ensure_throw(init_cp(0)); - set_c4(std::move(_data)); - if (init_c7.not_null()) { - set_c7(std::move(init_c7)); - } - init_cregs(flags & 1, flags & 2); -} - -VmState::VmState(Ref _code, Ref _stack, const GasLimits& gas, int flags, Ref _data, VmLog log, - std::vector> _libraries, Ref init_c7) - : code(std::move(_code)) - , stack(std::move(_stack)) - , cp(-1) - , dispatch(&dummy_dispatch_table) - , quit0(true, 0) - , quit1(true, 1) - , log(log) - , gas(gas) - , libraries(std::move(_libraries)) { - ensure_throw(init_cp(0)); - set_c4(std::move(_data)); - if (init_c7.not_null()) { - set_c7(std::move(init_c7)); - } - init_cregs(flags & 1, flags & 2); -} - -Ref VmState::convert_code_cell(Ref code_cell) { - if (code_cell.is_null()) { - return {}; - } - Ref csr{true, NoVmOrd(), code_cell}; - if (csr->is_valid()) { - return csr; - } - return load_cell_slice_ref(CellBuilder{}.store_ref(std::move(code_cell)).finalize()); -} - -bool VmState::init_cp(int new_cp) { - const DispatchTable* dt = DispatchTable::get_table(new_cp); - if (dt) { - cp = new_cp; - dispatch = dt; - return true; - } else { - return false; - } -} - -bool VmState::set_cp(int new_cp) { - return new_cp == cp || init_cp(new_cp); -} - -void VmState::force_cp(int new_cp) { - if (!set_cp(new_cp)) { - throw VmError{Excno::inv_opcode, "unsupported codepage"}; - } -} - -// simple call to a continuation cont -int VmState::call(Ref cont) { - const ControlData* cont_data = cont->get_cdata(); - if (cont_data) { - if (cont_data->save.c[0].not_null()) { - // call reduces to a jump - return jump(std::move(cont)); - } - if (cont_data->stack.not_null() || cont_data->nargs >= 0) { - // if cont has non-empty stack or expects fixed number of arguments, call is not simple - return call(std::move(cont), -1, -1); - } - // create return continuation, to be stored into new c0 - Ref ret = Ref{true, std::move(code), cp}; - ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0])); - cr.set_c0( - std::move(ret)); // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set - return jump_to(std::move(cont)); - } - // create return continuation, to be stored into new c0 - Ref ret = Ref{true, std::move(code), cp}; - ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0])); - // general implementation of a simple call - cr.set_c0(std::move(ret)); // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set - return jump_to(std::move(cont)); -} - -// call with parameters to continuation cont -int VmState::call(Ref cont, int pass_args, int ret_args) { - const ControlData* cont_data = cont->get_cdata(); - if (cont_data) { - if (cont_data->save.c[0].not_null()) { - // call reduces to a jump - return jump(std::move(cont), pass_args); - } - int depth = stack->depth(); - if (pass_args > depth || cont_data->nargs > depth) { - throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"}; - } - if (cont_data->nargs > pass_args && pass_args >= 0) { - throw VmError{Excno::stk_und, - "stack underflow while calling a closure continuation: not enough arguments passed"}; - } - auto old_c0 = std::move(cr.c[0]); - // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible - preclear_cr(cont_data->save); - // no exceptions should be thrown after this point - int copy = cont_data->nargs, skip = 0; - if (pass_args >= 0) { - if (copy >= 0) { - skip = pass_args - copy; - } else { - copy = pass_args; - } - } - // copy=-1 : pass whole stack, else pass top `copy` elements, drop next `skip` elements. - Ref new_stk; - if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) { - // `cont` already has a stack, create resulting stack from it - if (copy < 0) { - copy = stack->depth(); - } - if (cont->is_unique()) { - // optimization: avoid copying stack if we hold the only copy of `cont` - new_stk = std::move(cont.unique_write().get_cdata()->stack); - } else { - new_stk = cont_data->stack; - } - new_stk.write().move_from_stack(get_stack(), copy); - if (skip > 0) { - get_stack().pop_many(skip); - } - } else if (copy >= 0) { - new_stk = get_stack().split_top(copy, skip); - } else { - new_stk = std::move(stack); - stack.clear(); - } - // create return continuation using the remainder of current stack - Ref ret = Ref{true, std::move(code), cp, std::move(stack), ret_args}; - ret.unique_write().get_cdata()->save.set_c0(std::move(old_c0)); - Ref ord_cont = static_cast>(cont); - set_stack(std::move(new_stk)); - cr.set_c0(std::move(ret)); // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0 - return jump_to(std::move(cont)); - } else { - // have no continuation data, situation is somewhat simpler - int depth = stack->depth(); - if (pass_args > depth) { - throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"}; - } - // create new stack from the top `pass_args` elements of the current stack - Ref new_stk = (pass_args >= 0 ? get_stack().split_top(pass_args) : std::move(stack)); - // create return continuation using the remainder of the current stack - Ref ret = Ref{true, std::move(code), cp, std::move(stack), ret_args}; - ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0])); - set_stack(std::move(new_stk)); - cr.set_c0(std::move(ret)); // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0 - return jump_to(std::move(cont)); - } -} - -// simple jump to continuation cont -int VmState::jump(Ref cont) { - const ControlData* cont_data = cont->get_cdata(); - if (cont_data && (cont_data->stack.not_null() || cont_data->nargs >= 0)) { - // if cont has non-empty stack or expects fixed number of arguments, jump is not simple - return jump(std::move(cont), -1); - } else { - return jump_to(std::move(cont)); - } -} - -// general jump to continuation cont -int VmState::jump(Ref cont, int pass_args) { - const ControlData* cont_data = cont->get_cdata(); - if (cont_data) { - // first do the checks - int depth = stack->depth(); - if (pass_args > depth || cont_data->nargs > depth) { - throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"}; - } - if (cont_data->nargs > pass_args && pass_args >= 0) { - throw VmError{Excno::stk_und, - "stack underflow while jumping to closure continuation: not enough arguments passed"}; - } - // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible - preclear_cr(cont_data->save); - // no exceptions should be thrown after this point - int copy = cont_data->nargs; - if (pass_args >= 0 && copy < 0) { - copy = pass_args; - } - // copy=-1 : pass whole stack, else pass top `copy` elements, drop the remainder. - if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) { - // `cont` already has a stack, create resulting stack from it - if (copy < 0) { - copy = get_stack().depth(); - } - Ref new_stk; - if (cont->is_unique()) { - // optimization: avoid copying the stack if we hold the only copy of `cont` - new_stk = std::move(cont.unique_write().get_cdata()->stack); - } else { - new_stk = cont_data->stack; - } - new_stk.write().move_from_stack(get_stack(), copy); - set_stack(std::move(new_stk)); - } else { - if (copy >= 0) { - get_stack().drop_bottom(stack->depth() - copy); - } - } - return jump_to(std::move(cont)); - } else { - // have no continuation data, situation is somewhat simpler - if (pass_args >= 0) { - int depth = get_stack().depth(); - if (pass_args > depth) { - throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"}; - } - get_stack().drop_bottom(depth - pass_args); - } - return jump_to(std::move(cont)); - } -} - -int VmState::ret() { - Ref cont = quit0; - cont.swap(cr.c[0]); - return jump(std::move(cont)); -} - -int VmState::ret(int ret_args) { - Ref cont = quit0; - cont.swap(cr.c[0]); - return jump(std::move(cont), ret_args); -} - -int VmState::ret_alt() { - Ref cont = quit1; - cont.swap(cr.c[1]); - return jump(std::move(cont)); -} - -int VmState::ret_alt(int ret_args) { - Ref cont = quit1; - cont.swap(cr.c[1]); - return jump(std::move(cont), ret_args); -} - -Ref VmState::extract_cc(int save_cr, int stack_copy, int cc_args) { - Ref new_stk; - if (stack_copy < 0 || stack_copy == stack->depth()) { - new_stk = std::move(stack); - stack.clear(); - } else if (stack_copy > 0) { - stack->check_underflow(stack_copy); - new_stk = get_stack().split_top(stack_copy); - } else { - new_stk = Ref{true}; - } - Ref cc = Ref{true, std::move(code), cp, std::move(stack), cc_args}; - stack = std::move(new_stk); - if (save_cr & 7) { - ControlData* cdata = cc.unique_write().get_cdata(); - if (save_cr & 1) { - cdata->save.set_c0(std::move(cr.c[0])); - cr.set_c0(quit0); - } - if (save_cr & 2) { - cdata->save.set_c1(std::move(cr.c[1])); - cr.set_c1(quit1); - } - if (save_cr & 4) { - cdata->save.set_c2(std::move(cr.c[2])); - // cr.set_c2(Ref{true}); - } - } - return cc; -} - -int VmState::throw_exception(int excno) { - Stack& stack_ref = get_stack(); - stack_ref.clear(); - stack_ref.push_smallint(0); - stack_ref.push_smallint(excno); - code.clear(); - consume_gas(exception_gas_price); - return jump(get_c2()); -} - -int VmState::throw_exception(int excno, StackEntry&& arg) { - Stack& stack_ref = get_stack(); - stack_ref.clear(); - stack_ref.push(std::move(arg)); - stack_ref.push_smallint(excno); - code.clear(); - consume_gas(exception_gas_price); - return jump(get_c2()); -} - -void GasLimits::gas_exception() const { - throw VmNoGas{}; -} - -void GasLimits::set_limits(long long _max, long long _limit, long long _credit) { - gas_max = _max; - gas_limit = _limit; - gas_credit = _credit; - change_base(_limit + _credit); -} - -void GasLimits::change_limit(long long _limit) { - _limit = std::min(std::max(_limit, 0LL), gas_max); - gas_credit = 0; - gas_limit = _limit; - change_base(_limit); -} - -bool VmState::set_gas_limits(long long _max, long long _limit, long long _credit) { - gas.set_limits(_max, _limit, _credit); - return true; -} - -void VmState::change_gas_limit(long long new_limit) { - VM_LOG(this) << "changing gas limit to " << std::min(new_limit, gas.gas_max); - gas.change_limit(new_limit); -} - -int VmState::step() { - assert(!code.is_null()); - //VM_LOG(st) << "stack:"; stack->dump(VM_LOG(st)); - //VM_LOG(st) << "; cr0.refcnt = " << get_c0()->get_refcnt() - 1 << std::endl; - if (stack_trace) { - stack->dump(std::cerr); - } - ++steps; - if (code->size()) { - return dispatch->dispatch(this, code.write()); - } else if (code->size_refs()) { - VM_LOG(this) << "execute implicit JMPREF\n"; - Ref cont = Ref{true, load_cell_slice_ref(code->prefetch_ref()), get_cp()}; - return jump(std::move(cont)); - } else { - VM_LOG(this) << "execute implicit RET\n"; - return ret(); - } -} - -int VmState::run() { - int res; - Guard guard(this); - do { - // LOG(INFO) << "[BS] data cells: " << DataCell::get_total_data_cells(); - try { - try { - res = step(); - gas.check(); - } catch (vm::CellBuilder::CellWriteError) { - throw VmError{Excno::cell_ov}; - } catch (vm::CellBuilder::CellCreateError) { - throw VmError{Excno::cell_ov}; - } catch (vm::CellSlice::CellReadError) { - throw VmError{Excno::cell_und}; - } - } catch (const VmError& vme) { - VM_LOG(this) << "handling exception code " << vme.get_errno() << ": " << vme.get_msg(); - try { - // LOG(INFO) << "[EX] data cells: " << DataCell::get_total_data_cells(); - ++steps; - res = throw_exception(vme.get_errno()); - } catch (const VmError& vme2) { - VM_LOG(this) << "exception " << vme2.get_errno() << " while handling exception: " << vme.get_msg(); - // LOG(INFO) << "[EXX] data cells: " << DataCell::get_total_data_cells(); - return ~vme2.get_errno(); - } - } catch (VmNoGas vmoog) { - ++steps; - VM_LOG(this) << "unhandled out-of-gas exception: gas consumed=" << gas.gas_consumed() - << ", limit=" << gas.gas_limit; - get_stack().clear(); - get_stack().push_smallint(gas.gas_consumed()); - return vmoog.get_errno(); // no ~ for unhandled exceptions (to make their faking impossible) - } - } while (!res); - // LOG(INFO) << "[EN] data cells: " << DataCell::get_total_data_cells(); - if ((res | 1) == -1) { - commit(); - } - return res; -} - -ControlData* force_cdata(Ref& cont) { - if (!cont->get_cdata()) { - cont = Ref{true, cont}; - return cont.unique_write().get_cdata(); - } else { - return cont.write().get_cdata(); - } -} - -ControlRegs* force_cregs(Ref& cont) { - return &force_cdata(cont)->save; -} - -int run_vm_code(Ref code, Ref& stack, int flags, Ref* data_ptr, VmLog log, long long* steps, - GasLimits* gas_limits, std::vector> libraries, Ref init_c7) { - VmState vm{code, - std::move(stack), - gas_limits ? *gas_limits : GasLimits{}, - flags, - data_ptr ? *data_ptr : Ref{}, - log, - std::move(libraries), - std::move(init_c7)}; - int res = vm.run(); - stack = vm.get_stack_ref(); - if (res == -1 && data_ptr) { - *data_ptr = vm.get_c4(); - } - if (steps) { - *steps = vm.get_steps_count(); - } - if (gas_limits) { - *gas_limits = vm.get_gas_limits(); - LOG(INFO) << "steps: " << vm.get_steps_count() << " gas: used=" << gas_limits->gas_consumed() - << ", max=" << gas_limits->gas_max << ", limit=" << gas_limits->gas_limit - << ", credit=" << gas_limits->gas_credit; - } - if ((vm.get_log().log_mask & vm::VmLog::DumpStack) != 0) { - VM_LOG(&vm) << "BEGIN_STACK_DUMP"; - for (int i = stack->depth(); i > 0; i--) { - VM_LOG(&vm) << (*stack)[i - 1].to_string(); - } - VM_LOG(&vm) << "END_STACK_DUMP"; - } - - return ~res; -} - -int run_vm_code(Ref code, Stack& stack, int flags, Ref* data_ptr, VmLog log, long long* steps, - GasLimits* gas_limits, std::vector> libraries, Ref init_c7) { - Ref stk{true}; - stk.unique_write().set_contents(std::move(stack)); - stack.clear(); - int res = run_vm_code(code, stk, flags, data_ptr, log, steps, gas_limits, std::move(libraries), std::move(init_c7)); - CHECK(stack.is_unique()); - if (stk.is_null()) { - stack.clear(); - } else if (&(*stk) != &stack) { - VmState* st = nullptr; - if (stk->is_unique()) { - VM_LOG(st) << "move resulting stack (" << stk->depth() << " entries)"; - stack.set_contents(std::move(stk.unique_write())); - } else { - VM_LOG(st) << "copying resulting stack (" << stk->depth() << " entries)"; - stack.set_contents(*stk); - } - } - return res; -} - -// may throw a dictionary exception; returns nullptr if library is not found in context -Ref VmState::load_library(td::ConstBitPtr hash) { - std::unique_ptr tmp_ctx; - // install temporary dummy vm state interface to prevent charging for cell load operations during library lookup - VmStateInterface::Guard(tmp_ctx.get()); - for (const auto& lib_collection : libraries) { - auto lib = lookup_library_in(hash, lib_collection); - if (lib.not_null()) { - return lib; - } - } - return {}; -} - -bool VmState::register_library_collection(Ref lib) { - if (lib.is_null()) { - return true; - } - libraries.push_back(std::move(lib)); - return true; -} - -void VmState::register_cell_load() { - consume_gas(cell_load_gas_price); -} - -void VmState::register_cell_create() { - consume_gas(cell_create_gas_price); -} - -td::BitArray<256> VmState::get_state_hash() const { - // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash - td::BitArray<256> res; - res.clear(); - return res; -} - -td::BitArray<256> VmState::get_final_state_hash(int exit_code) const { - // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash - td::BitArray<256> res; - res.clear(); - return res; -} - -Ref lookup_library_in(td::ConstBitPtr key, vm::Dictionary& dict) { - try { - auto val = dict.lookup(key, 256); - if (val.is_null() || !val->have_refs()) { - return {}; - } - auto root = val->prefetch_ref(); - if (root.not_null() && !root->get_hash().bits().compare(key, 256)) { - return root; - } - return {}; - } catch (vm::VmError) { - return {}; - } -} - -Ref lookup_library_in(td::ConstBitPtr key, Ref lib_root) { - if (lib_root.is_null()) { - return lib_root; - } - vm::Dictionary dict{std::move(lib_root), 256}; - return lookup_library_in(key, dict); -} - } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/continuation.h b/submodules/ton/tonlib-src/crypto/vm/continuation.h index c6c9d320ed..37abe86996 100644 --- a/submodules/ton/tonlib-src/crypto/vm/continuation.h +++ b/submodules/ton/tonlib-src/crypto/vm/continuation.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -37,6 +37,7 @@ struct ControlRegs { Ref c[creg_num]; // c0..c3 Ref d[dreg_num]; // c4..c5 Ref c7; // c7 + bool clear(); Ref get_c(unsigned idx) const { return idx < creg_num ? c[idx] : Ref{}; } @@ -135,6 +136,9 @@ struct ControlRegs { ControlRegs& operator&=(const ControlRegs& save); // clears all c[i]'s which are present in save ControlRegs& operator^=(const ControlRegs& save); // sets c[i]=save.c[i] for all save.c[i] != 0 ControlRegs& operator^=(ControlRegs&& save); + bool serialize(CellBuilder& cb) const; + bool deserialize(CellSlice& cs, int mode = 0); + bool deserialize(Ref root, int mode = 0); }; struct ControlData { @@ -150,11 +154,14 @@ struct ControlData { } ControlData(int _cp, Ref _stack, int _nargs = -1) : stack(std::move(_stack)), nargs(_nargs), cp(_cp) { } + bool clear(); + bool serialize(CellBuilder& cb) const; + bool deserialize(CellSlice& cs, int mode = 0); }; class Continuation : public td::CntObject { public: - virtual int jump(VmState* st) const& = 0; + virtual int jump(VmState* st) const & = 0; virtual int jump_w(VmState* st) &; virtual ControlData* get_cdata() { return 0; @@ -175,6 +182,15 @@ class Continuation : public td::CntObject { return *this; } ~Continuation() override = default; + virtual bool serialize(CellBuilder& cb) const { + return false; + } + bool serialize_ref(CellBuilder& cb) const; + static Ref deserialize(CellSlice& cs, int mode = 0); + static bool deserialize_to(CellSlice& cs, Ref& cont, int mode = 0) { + return (cont = deserialize(cs, mode)).not_null(); + } + static bool deserialize_to(Ref cell, Ref& cont, int mode = 0); }; class QuitCont : public Continuation { @@ -184,16 +200,20 @@ class QuitCont : public Continuation { QuitCont(int _code = 0) : exit_code(_code) { } ~QuitCont() override = default; - int jump(VmState* st) const& override { + int jump(VmState* st) const & override { return ~exit_code; } + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class ExcQuitCont : public Continuation { public: ExcQuitCont() = default; ~ExcQuitCont() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class PushIntCont : public Continuation { @@ -204,8 +224,10 @@ class PushIntCont : public Continuation { PushIntCont(int val, Ref _next) : push_val(val), next(_next) { } ~PushIntCont() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class RepeatCont : public Continuation { @@ -217,8 +239,10 @@ class RepeatCont : public Continuation { : body(std::move(_body)), after(std::move(_after)), count(_count) { } ~RepeatCont() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class AgainCont : public Continuation { @@ -228,8 +252,10 @@ class AgainCont : public Continuation { AgainCont(Ref _body) : body(std::move(_body)) { } ~AgainCont() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class UntilCont : public Continuation { @@ -239,8 +265,10 @@ class UntilCont : public Continuation { UntilCont(Ref _body, Ref _after) : body(std::move(_body)), after(std::move(_after)) { } ~UntilCont() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class WhileCont : public Continuation { @@ -252,8 +280,10 @@ class WhileCont : public Continuation { : cond(std::move(_cond)), body(std::move(_body)), after(std::move(_after)), chkcond(_chk) { } ~WhileCont() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class ArgContExt : public Continuation { @@ -261,14 +291,18 @@ class ArgContExt : public Continuation { Ref ext; public: - ArgContExt(Ref _ext) : data(), ext(_ext) { + ArgContExt(Ref _ext) : data(), ext(std::move(_ext)) { } - ArgContExt(Ref _ext, Ref _stack) : data(_stack), ext(_ext) { + ArgContExt(Ref _ext, Ref _stack) : data(std::move(_stack)), ext(std::move(_ext)) { + } + ArgContExt(Ref _ext, const ControlData& _cdata) : data(_cdata), ext(std::move(_ext)) { + } + ArgContExt(Ref _ext, ControlData&& _cdata) : data(std::move(_cdata)), ext(std::move(_ext)) { } ArgContExt(const ArgContExt&) = default; ArgContExt(ArgContExt&&) = default; ~ArgContExt() override = default; - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; ControlData* get_cdata() override { return &data; @@ -279,6 +313,8 @@ class ArgContExt : public Continuation { td::CntObject* make_copy() const override { return new ArgContExt{*this}; } + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; class OrdCont : public Continuation { @@ -296,6 +332,10 @@ class OrdCont : public Continuation { OrdCont(Ref _code, int _cp, Ref _stack, int nargs = -1) : data(_cp, std::move(_stack), nargs), code(std::move(_code)) { } + OrdCont(Ref _code, const ControlData& _cdata) : data(_cdata), code(std::move(_code)) { + } + OrdCont(Ref _code, ControlData&& _cdata) : data(std::move(_cdata)), code(std::move(_code)) { + } OrdCont(const OrdCont&) = default; OrdCont(OrdCont&&) = default; ~OrdCont() override = default; @@ -303,7 +343,7 @@ class OrdCont : public Continuation { td::CntObject* make_copy() const override { return new OrdCont{*this}; } - int jump(VmState* st) const& override; + int jump(VmState* st) const & override; int jump_w(VmState* st) & override; ControlData* get_cdata() override { @@ -321,297 +361,17 @@ class OrdCont : public Continuation { Ref get_stack_ref() const { return data.stack; } - Ref copy_ord() const& { + Ref copy_ord() const & { return Ref{true, *this}; } Ref copy_ord() && { return Ref{true, *this}; } + bool serialize(CellBuilder& cb) const override; + static Ref deserialize(CellSlice& cs, int mode = 0); }; -struct GasLimits { - static constexpr long long infty = (1ULL << 63) - 1; - long long gas_max, gas_limit, gas_credit, gas_remaining, gas_base; - GasLimits() : gas_max(infty), gas_limit(infty), gas_credit(0), gas_remaining(infty), gas_base(infty) { - } - GasLimits(long long _limit, long long _max = infty, long long _credit = 0) - : gas_max(_max) - , gas_limit(_limit) - , gas_credit(_credit) - , gas_remaining(_limit + _credit) - , gas_base(gas_remaining) { - } - long long gas_consumed() const { - return gas_base - gas_remaining; - } - void set_limits(long long _max, long long _limit, long long _credit = 0); - void change_base(long long _base) { - gas_remaining += _base - gas_base; - gas_base = _base; - } - void change_limit(long long _limit); - void consume(long long amount) { - // LOG(DEBUG) << "consume " << amount << " gas (" << gas_remaining << " remaining)"; - gas_remaining -= amount; - } - bool try_consume(long long amount) { - // LOG(DEBUG) << "try consume " << amount << " gas (" << gas_remaining << " remaining)"; - return (gas_remaining -= amount) >= 0; - } - void gas_exception() const; - void gas_exception(bool cond) const { - if (!cond) { - gas_exception(); - } - } - void consume_chk(long long amount) { - gas_exception(try_consume(amount)); - } - void check() const { - gas_exception(gas_remaining >= 0); - } - bool final_ok() const { - return gas_remaining >= gas_credit; - } -}; - -struct CommittedState { - Ref c4, c5; - bool committed{false}; -}; - -class VmState final : public VmStateInterface { - Ref code; - Ref stack; - ControlRegs cr; - CommittedState cstate; - int cp; - long long steps{0}; - const DispatchTable* dispatch; - Ref quit0, quit1; - VmLog log; - GasLimits gas; - std::vector> libraries; - int stack_trace{0}, debug_off{0}; - - bool chksig_always_succeed{false}; - - public: - static constexpr unsigned cell_load_gas_price = 100, cell_create_gas_price = 500, exception_gas_price = 50, - tuple_entry_gas_price = 1; - VmState(); - VmState(Ref _code); - VmState(Ref _code, Ref _stack, int flags = 0, Ref _data = {}, VmLog log = {}, - std::vector> _libraries = {}, Ref init_c7 = {}); - VmState(Ref _code, Ref _stack, const GasLimits& _gas, int flags = 0, Ref _data = {}, - VmLog log = {}, std::vector> _libraries = {}, Ref init_c7 = {}); - template - VmState(Ref code_cell, Args&&... args) - : VmState(convert_code_cell(std::move(code_cell)), std::forward(args)...) { - } - VmState(const VmState&) = delete; - VmState(VmState&&) = delete; - VmState& operator=(const VmState&) = delete; - VmState& operator=(VmState&&) = delete; - bool set_gas_limits(long long _max, long long _limit, long long _credit = 0); - bool final_gas_ok() const { - return gas.final_ok(); - } - long long gas_consumed() const { - return gas.gas_consumed(); - } - bool committed() const { - return cstate.committed; - } - const CommittedState& get_committed_state() const { - return cstate; - } - void consume_gas(long long amount) { - gas.consume(amount); - } - void consume_tuple_gas(unsigned tuple_len) { - consume_gas(tuple_len * tuple_entry_gas_price); - } - void consume_tuple_gas(const Ref& tup) { - if (tup.not_null()) { - consume_tuple_gas((unsigned)tup->size()); - } - } - GasLimits get_gas_limits() const { - return gas; - } - void change_gas_limit(long long new_limit); - template - void check_underflow(Args... args) { - stack->check_underflow(args...); - } - bool register_library_collection(Ref lib); - Ref load_library( - td::ConstBitPtr hash) override; // may throw a dictionary exception; returns nullptr if library is not found - void register_cell_load() override; - void register_cell_create() override; - bool init_cp(int new_cp); - bool set_cp(int new_cp); - void force_cp(int new_cp); - int get_cp() const { - return cp; - } - int incr_stack_trace(int v) { - return stack_trace += v; - } - long long get_steps_count() const { - return steps; - } - td::BitArray<256> get_state_hash() const; - td::BitArray<256> get_final_state_hash(int exit_code) const; - int step(); - int run(); - Stack& get_stack() { - return stack.write(); - } - const Stack& get_stack_const() const { - return *stack; - } - Ref get_stack_ref() const { - return stack; - } - Ref get_c0() const { - return cr.c[0]; - } - Ref get_c1() const { - return cr.c[1]; - } - Ref get_c2() const { - return cr.c[2]; - } - Ref get_c3() const { - return cr.c[3]; - } - Ref get_c4() const { - return cr.d[0]; - } - Ref get_c7() const { - return cr.c7; - } - Ref get_c(unsigned idx) const { - return cr.get_c(idx); - } - Ref get_d(unsigned idx) const { - return cr.get_d(idx); - } - StackEntry get(unsigned idx) const { - return cr.get(idx); - } - const VmLog& get_log() const { - return log; - } - void define_c0(Ref cont) { - cr.define_c0(std::move(cont)); - } - void set_c0(Ref cont) { - cr.set_c0(std::move(cont)); - } - void set_c1(Ref cont) { - cr.set_c1(std::move(cont)); - } - void set_c2(Ref cont) { - cr.set_c2(std::move(cont)); - } - bool set_c(unsigned idx, Ref val) { - return cr.set_c(idx, std::move(val)); - } - bool set_d(unsigned idx, Ref val) { - return cr.set_d(idx, std::move(val)); - } - void set_c4(Ref val) { - cr.set_c4(std::move(val)); - } - bool set_c7(Ref val) { - return cr.set_c7(std::move(val)); - } - bool set(unsigned idx, StackEntry val) { - return cr.set(idx, std::move(val)); - } - void set_stack(Ref new_stk) { - stack = std::move(new_stk); - } - Ref swap_stack(Ref new_stk) { - stack.swap(new_stk); - return new_stk; - } - void ensure_throw(bool cond) const { - if (!cond) { - fatal(); - } - } - void set_code(Ref _code, int _cp) { - code = std::move(_code); - force_cp(_cp); - } - Ref get_code() const { - return code; - } - void push_code() { - get_stack().push_cellslice(get_code()); - } - void adjust_cr(const ControlRegs& save) { - cr ^= save; - } - void adjust_cr(ControlRegs&& save) { - cr ^= save; - } - void preclear_cr(const ControlRegs& save) { - cr &= save; - } - int call(Ref cont); - int call(Ref cont, int pass_args, int ret_args = -1); - int jump(Ref cont); - int jump(Ref cont, int pass_args); - int ret(); - int ret(int ret_args); - int ret_alt(); - int ret_alt(int ret_args); - int repeat(Ref body, Ref after, long long count); - int again(Ref body); - int until(Ref body, Ref after); - int loop_while(Ref cond, Ref body, Ref after); - int throw_exception(int excno, StackEntry&& arg); - int throw_exception(int excno); - Ref extract_cc(int save_cr = 1, int stack_copy = -1, int cc_args = -1); - void fatal(void) const { - throw VmFatal{}; - } - int jump_to(Ref cont) { - return cont->is_unique() ? cont.unique_write().jump_w(this) : cont->jump(this); - } - static Ref convert_code_cell(Ref code_cell); - void commit() { - cstate.c4 = cr.d[0]; - cstate.c5 = cr.d[1]; - cstate.committed = true; - } - - void set_chksig_always_succeed(bool flag) { - chksig_always_succeed = flag; - } - bool get_chksig_always_succeed() const { - return chksig_always_succeed; - } - - private: - void init_cregs(bool same_c3 = false, bool push_0 = true); -}; - -int run_vm_code(Ref _code, Ref& _stack, int flags = 0, Ref* data_ptr = 0, VmLog log = {}, - long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector> libraries = {}, - Ref init_c7 = {}); -int run_vm_code(Ref _code, Stack& _stack, int flags = 0, Ref* data_ptr = 0, VmLog log = {}, - long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector> libraries = {}, - Ref init_c7 = {}); - ControlData* force_cdata(Ref& cont); ControlRegs* force_cregs(Ref& cont); -Ref lookup_library_in(td::ConstBitPtr key, Ref lib_root); - } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/contops.cpp b/submodules/ton/tonlib-src/crypto/vm/contops.cpp index 0039439e6b..63d5570539 100644 --- a/submodules/ton/tonlib-src/crypto/vm/contops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/contops.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include "vm/contops.h" @@ -24,6 +24,7 @@ #include "vm/continuation.h" #include "vm/cellops.h" #include "vm/excno.hpp" +#include "vm/vm.h" namespace vm { @@ -626,9 +627,23 @@ inline void throw_rangechk(bool ok) { } } // namespace +int exec_bless_pop_c3(VmState* st) { + Stack& stack = st->get_stack(); + VM_LOG(st) << "execute CTOSBLESSPOPc3"; + stack.check_underflow(1); + throw_typechk(st->set_c(3, Ref{true, vm::load_cell_slice_ref(stack.pop_cell()), st->get_cp()})); + return 0; +} + int exec_pop_ctr(VmState* st, unsigned args) { unsigned idx = args & 15; VM_LOG(st) << "execute POP c" << idx; + /* + if (idx == 3 && st->get_stack().depth() > 0 && st->get_stack().tos().is(StackEntry::t_cell)) { + // temp hack: accept cell argument for POP c3 and do auto-BLESSing + return exec_bless_pop_c3(st); + } + */ throw_typechk(st->set(idx, st->get_stack().pop_chk())); return 0; } diff --git a/submodules/ton/tonlib-src/crypto/vm/cp0.cpp b/submodules/ton/tonlib-src/crypto/vm/cp0.cpp index 3e062140f2..fe5dd8ef1f 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cp0.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/cp0.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "cp0.h" #include "opctable.h" @@ -29,7 +29,8 @@ namespace vm { -const OpcodeTable* init_op_cp0() { +const OpcodeTable* init_op_cp0(bool enable_debug) { + set_debug_enabled(enable_debug); static const OpcodeTable* static_op_cp0 = [] { auto op_cp0 = new OpcodeTable("TEST CODEPAGE", Codepage::test_cp); register_stack_ops(*op_cp0); // stackops.cpp diff --git a/submodules/ton/tonlib-src/crypto/vm/cp0.h b/submodules/ton/tonlib-src/crypto/vm/cp0.h index 34fc971142..9a6579697d 100644 --- a/submodules/ton/tonlib-src/crypto/vm/cp0.h +++ b/submodules/ton/tonlib-src/crypto/vm/cp0.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "vm/dispatch.h" @@ -23,6 +23,6 @@ namespace vm { class OpcodeTable; -const OpcodeTable* init_op_cp0(); +const OpcodeTable* init_op_cp0(bool debug_enabled = false); } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/debugops.cpp b/submodules/ton/tonlib-src/crypto/vm/debugops.cpp index 911d6313b8..0ec205a315 100644 --- a/submodules/ton/tonlib-src/crypto/vm/debugops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/debugops.cpp @@ -14,19 +14,23 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include "vm/debugops.h" #include "vm/log.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" +#include "vm/vm.h" namespace vm { -bool vm_debug_enabled = true; +bool vm_debug_enabled = false; + +void set_debug_enabled(bool enable_debug) { + vm_debug_enabled = enable_debug; +} int exec_dummy_debug(VmState* st, int args) { VM_LOG(st) << "execute DEBUG " << (args & 0xff); @@ -66,6 +70,9 @@ int compute_len_debug_str(const CellSlice& cs, unsigned args, int pfx_bits) { int exec_dump_stack(VmState* st) { VM_LOG(st) << "execute DUMPSTK"; + if (!vm_debug_enabled) { + return 0; + } Stack& stack = st->get_stack(); int d = stack.depth(); std::cerr << "#DEBUG#: stack(" << d << " values) : "; @@ -74,7 +81,8 @@ int exec_dump_stack(VmState* st) { d = 255; } for (int i = d; i > 0; i--) { - std::cerr << stack[i - 1].to_string() << " "; + stack[i - 1].print_list(std::cerr); + std::cerr << ' '; } std::cerr << std::endl; return 0; @@ -83,9 +91,14 @@ int exec_dump_stack(VmState* st) { int exec_dump_value(VmState* st, unsigned arg) { arg &= 15; VM_LOG(st) << "execute DUMP s" << arg; + if (!vm_debug_enabled) { + return 0; + } Stack& stack = st->get_stack(); if ((int)arg < stack.depth()) { - std::cerr << "#DEBUG#: s" << arg << " = " << stack[arg].to_string() << std::endl; + std::cerr << "#DEBUG#: s" << arg << " = "; + stack[arg].print_list(std::cerr); + std::cerr << std::endl; } else { std::cerr << "#DEBUG#: s" << arg << " is absent" << std::endl; } diff --git a/submodules/ton/tonlib-src/crypto/vm/debugops.h b/submodules/ton/tonlib-src/crypto/vm/debugops.h index 7c7b27d010..ba3d673ff4 100644 --- a/submodules/ton/tonlib-src/crypto/vm/debugops.h +++ b/submodules/ton/tonlib-src/crypto/vm/debugops.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -25,5 +25,6 @@ class OpcodeTable; extern bool vm_debug_enabled; void register_debug_ops(OpcodeTable& cp0); +void set_debug_enabled(bool enable_debug); } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/dict.cpp b/submodules/ton/tonlib-src/crypto/vm/dict.cpp index 7037e7e41c..fc94a2dc5a 100644 --- a/submodules/ton/tonlib-src/crypto/vm/dict.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/dict.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/dict.h" #include "vm/cells.h" @@ -179,7 +179,7 @@ bool DictionaryBase::append_dict_to_bool(CellBuilder& cb) && { return cb.store_maybe_ref(std::move(root_cell)); } -bool DictionaryBase::append_dict_to_bool(CellBuilder& cb) const& { +bool DictionaryBase::append_dict_to_bool(CellBuilder& cb) const & { return is_valid() && cb.store_maybe_ref(root_cell); } @@ -793,8 +793,7 @@ std::tuple, Ref, bool> dict_lookup_set(Ref dict, td:: std::pair, bool> pfx_dict_set(Ref dict, td::ConstBitPtr key, int m, int n, const PrefixDictionary::store_value_func_t& store_val, Dictionary::SetMode mode) { - std::cerr << "up to " << n << "-bit prefix code dictionary modification for " << m << "-bit key = " << key.to_hex(m) - << std::endl; + // std::cerr << "up to " << n << "-bit prefix code dictionary modification for " << m << "-bit key = " << key.to_hex(m) << std::endl; if (m > n) { return std::make_pair(Ref{}, false); } @@ -1309,6 +1308,294 @@ Ref Dictionary::extract_minmax_key_ref(td::BitPtr key_buffer, int key_len, return extract_value_ref(extract_minmax_key(key_buffer, key_len, fetch_max, invert_first)); } +/* + * + * ITERATORS (to be moved into a separate file) + * + */ + +bool DictIterator::prevalidate(int mode) { + if (key_bits_ <= 0 || key_bits_ > Dictionary::max_key_bits) { + reset(); + flags_ &= ~f_valid; + key_bits_ = 0; + return false; + } else { + if (mode >= 0) { + order_ = -(mode & 1) ^ ((mode >> 1) & 1); + } + flags_ |= f_valid; + return true; + } +} + +bool DictIterator::bind(const DictionaryFixed& dict, int do_rewind) { + if (!is_valid() || !is_bound_to(dict)) { + return false; + } + dict_ = &dict; + label_mode_ = dict.label_mode(); + return !do_rewind || rewind(do_rewind < 0); +} + +bool DictIterator::rebind_to(const DictionaryFixed& dict, int do_rewind) { + reset(); + dict_ = &dict; + label_mode_ = dict.label_mode(); + root_ = dict.get_root_cell(); + key_bits_ = dict.get_key_bits(); + flags_ &= 3; + return prevalidate() && (!do_rewind || rewind(do_rewind < 0)); +} + +int DictIterator::compare_keys(td::ConstBitPtr a, td::ConstBitPtr b) const { + if (!key_bits_) { + return 0; + } + int c = (int)*a - (int)*b; + if (c) { + return (order_ & 1) ? -c : c; + } + c = a.compare(b, key_bits_); + return order_ >= 0 ? c : -c; +} + +bool DictIterator::dive(int mode) { + int n = key_bits_, m = 0; + Ref node = path_.empty() ? root_ : path_.back().next; + if (!path_.empty()) { + m = path_.back().pos + 1; + n -= m; + mode >>= 1; + } + // similar to dict_lookup_minmax: create new path down until the leaf + while (1) { + LabelParser label{std::move(node), n, label_mode_}; + int l = label.extract_label_to(key(m)); + assert(l >= 0 && l <= n); + m += l; + n -= l; + if (!n) { + leaf_ = std::move(label.remainder); + return true; + } + if (l) { + mode >>= 1; + } + int bit = mode & 1; + node = label.remainder->prefetch_ref(bit); + auto alt = label.remainder->prefetch_ref(1 - bit); + path_.emplace_back(node, std::move(alt), m, bit); + *key(m++) = (bool)bit; + --n; + mode >>= 1; + } +} + +bool DictIterator::rewind(bool to_end) { + if (!is_valid()) { + return false; + } + if (root_.is_null()) { + return true; + } + auto node = root_; + int k = 0, mode = order_ ^ -(int)to_end; + // NB: can optimize by reusing several first entries of current path_ + while (k < (int)path_.size()) { + auto& pe = path_[k++]; + assert(pe.pos >= 0 && pe.pos < key_bits_); + if (pe.pos) { + mode >>= 1; + } + if (pe.v != (bool)(mode & 1)) { + // went different way at this node before, rotate and stop going down + pe.rotate(key()); + leaf_.clear(); + path_.resize(k); // drop the remainder of the original path after first incorrect branch + return dive(mode); + } + mode >>= 1; + } + return !eof() || dive(mode); +} + +bool DictIterator::next(bool go_back) { + if (!is_valid() || root_.is_null() || eof()) { + return false; + } + leaf_.clear(); + int mode = order_ ^ -(int)go_back; + while (!path_.empty()) { + auto& pe = path_.back(); + int bit = (mode >> (pe.pos > 0)) & 1; + if (pe.v == bit) { + pe.rotate(key()); + return dive(mode); + } + path_.pop_back(); + } + return false; +} + +bool DictIterator::lookup(td::ConstBitPtr pos, int pos_bits, bool strict_after, bool backw) { + if (!is_valid() || root_.is_null() || pos_bits < 0 || pos_bits > key_bits_) { + return false; + } + int fill_mode = -(strict_after ^ backw) ^ order_; + if (!eof()) { + // reuse part of current path + std::size_t bp0 = 0; + int bp; + if (!key().compare(pos, pos_bits, &bp0)) { + bp = pos_bits; + if (bp >= key_bits_) { + // already at the desired element + return !strict_after || next(backw); + } + } else { + bp = (int)bp0; + } + int k = 0; + while (k < (int)path_.size() && path_[k].pos <= bp) { + auto& pe = path_[k]; + if (pe.pos == bp) { + if (bp < pos_bits || pe.v != ((fill_mode >> (bp > 0)) & 1)) { + // rotate the last path element if it branched in incorrect direction + path_[k++].rotate(key()); + } + break; + } + ++k; + } + path_.resize(k); // drop the remainder of the path + } + int m = 0, n = key_bits_; + auto node = path_.empty() ? root_ : path_.back().next; + if (!path_.empty()) { + m = path_.back().pos + 1; // m <= pos_bits + 1 + n -= m; + } + int mode = -backw ^ order_, action = 0; + while (m < pos_bits && !action) { + LabelParser label{std::move(node), n, label_mode_}; + int pfx_len = label.common_prefix_len(pos + m, pos_bits - m); + int l = label.extract_label_to(key() + m); + assert(pfx_len >= 0 && pfx_len <= label.l_bits && label.l_bits <= n); + if (pfx_len == pos_bits - m) { + // end of given position prefix + if (strict_after) { + // have to backtrace + action = 2; + break; + } else { + // label has correct prefix, register and dive down + action = 1; + } + } else if (pfx_len < l) { + // all subtree is either smaller or larger than required + if (pos[m + pfx_len] != ((mode >> (int)(m + pfx_len > 0)) & 1)) { + // label smaller than required, have to backtrace + action = 2; + break; + } else { + // label larger than required, register node and dive down + action = 1; + } + } + // if we are here, then either action=1 (dive down activated) + // ... or l = pfx_len < pos_bits - m + // continue going down + m += l; + n -= l; + if (!n) { + // key found in a leaf + leaf_ = std::move(label.remainder); + return true; + } + bool bit = action ? ((mode >> (m > 0)) & 1) : pos[m]; + node = label.remainder->prefetch_ref(bit); + auto alt = label.remainder->prefetch_ref(1 - bit); + path_.emplace_back(node, std::move(alt), m, bit); + *key(m++) = (bool)bit; + --n; + } + if (!action) { + action = (strict_after ? 2 : 1); + } + if (action == 2) { + // have to backtrace to the "next" larger branch + // similar to next() + leaf_.clear(); + while (!path_.empty()) { + auto& pe = path_.back(); + int bit = (mode >> (pe.pos > 0)) & 1; + if (pe.v == bit) { + pe.rotate(key()); + return dive(mode); + } + path_.pop_back(); + } + return false; // eof: no suitable element + } + // action=1, dive down + return dive(mode); +} + +DictIterator DictionaryFixed::null_iterator() { + force_validate(); + return DictIterator{*this}; +} + +DictIterator DictionaryFixed::make_iterator(int mode) { + force_validate(); + DictIterator it{*this, mode}; + it.rewind(); + return it; +} + +DictIterator DictionaryFixed::init_iterator(bool backw, bool invert_first) { + return make_iterator((int)backw + 2 * (int)invert_first); +} + +DictIterator DictionaryFixed::begin() { + return init_iterator(); +} + +DictIterator DictionaryFixed::end() { + return null_iterator(); +} + +DictIterator DictionaryFixed::cbegin() { + return begin(); +} + +DictIterator DictionaryFixed::cend() { + return end(); +} + +DictIterator DictionaryFixed::rbegin() { + return init_iterator(true); +} + +DictIterator DictionaryFixed::rend() { + return null_iterator(); +} + +DictIterator DictionaryFixed::crbegin() { + return rbegin(); +} + +DictIterator DictionaryFixed::crend() { + return rend(); +} + +/* + * + * END (ITERATORS) + * + */ + std::pair, bool> DictionaryFixed::extract_prefix_subdict_internal(Ref dict, td::ConstBitPtr prefix, int prefix_len, bool remove_prefix) const { if (is_empty() || prefix_len <= 0) { @@ -2241,7 +2528,7 @@ Ref AugmentedDictionary::extract_root() && { return std::move(root); } -bool AugmentedDictionary::append_dict_to_bool(CellBuilder& cb) const& { +bool AugmentedDictionary::append_dict_to_bool(CellBuilder& cb) const & { if (!is_valid()) { return false; } @@ -2310,6 +2597,14 @@ Ref AugmentedDictionary::get_node_extra(Ref cell_ref, int n) co return {}; } +Ref AugmentedDictionary::extract_leaf_value(Ref leaf) const { + if (leaf.not_null() && aug.skip_extra(leaf.write())) { + return std::move(leaf); + } else { + return Ref{}; + } +} + Ref AugmentedDictionary::get_root_extra() const { return get_node_extra(root_cell, key_bits); } @@ -2536,7 +2831,7 @@ bool AugmentedDictionary::set(td::ConstBitPtr key, int key_len, const CellSlice& } auto res = dict_set(get_root_cell(), key, key_len, value, mode); if (res.second) { - //vm::CellSlice cs{vm::NoVm{}, res.first}; + //vm::CellSlice cs{vm::NoVmOrd(), res.first}; //std::cerr << "new augmented dictionary root is:\n"; //cs.print_rec(std::cerr); set_root_cell(std::move(res.first)); diff --git a/submodules/ton/tonlib-src/crypto/vm/dict.h b/submodules/ton/tonlib-src/crypto/vm/dict.h index 11234277dd..761c4073b7 100644 --- a/submodules/ton/tonlib-src/crypto/vm/dict.h +++ b/submodules/ton/tonlib-src/crypto/vm/dict.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "common/bitstring.h" @@ -171,6 +171,13 @@ class DictionaryBase { } }; +class DictIterator; + +template +std::pair dict_range(T&& dict, bool rev = false, bool sgnd = false) { + return std::pair{std::forward(dict), (int)rev + 2 * (int)sgnd}; +} + class DictionaryFixed : public DictionaryBase { public: typedef std::function filter_func_t; @@ -199,6 +206,9 @@ class DictionaryFixed : public DictionaryBase { static BitSlice integer_key(td::RefInt256 x, unsigned n, bool sgnd = true, unsigned char buffer[128] = 0, bool quiet = false); static bool integer_key_simple(td::RefInt256 x, unsigned n, bool sgnd, td::BitPtr buffer, bool quiet = false); + td::RefInt256 key_as_integer(td::ConstBitPtr key, bool sgnd = false) const { + return td::bits_to_refint(key, key_bits, sgnd); + } bool key_exists(td::ConstBitPtr key, int key_len); bool int_key_exists(long long key); bool uint_key_exists(unsigned long long key); @@ -221,6 +231,17 @@ class DictionaryFixed : public DictionaryBase { bool scan_diff(DictionaryFixed& dict2, const scan_diff_func_t& diff_func, int check_augm = 0); bool validate_check(const foreach_func_t& foreach_func, bool invert_first = false); bool validate_all(); + DictIterator null_iterator(); + DictIterator init_iterator(bool backw = false, bool invert_first = false); + DictIterator make_iterator(int mode); + DictIterator begin(); + DictIterator end(); + DictIterator cbegin(); + DictIterator cend(); + DictIterator rbegin(); + DictIterator rend(); + DictIterator crbegin(); + DictIterator crend(); template bool key_exists(const T& key) { return key_exists(key.bits(), key.size()); @@ -237,11 +258,19 @@ class DictionaryFixed : public DictionaryBase { Ref get_minmax_key(T& key_buffer, bool fetch_max = false, bool invert_first = false) { return get_minmax_key(key_buffer.bits(), key_buffer.size(), fetch_max, invert_first); } + template + Ref lookup_nearest_key(T& key_buffer, bool fetch_next = false, bool allow_eq = false, + bool invert_first = false) { + return lookup_nearest_key(key_buffer.bits(), key_buffer.size(), fetch_next, allow_eq, invert_first); + } protected: virtual int label_mode() const { return dict::LabelParser::chk_all; } + virtual Ref extract_leaf_value(Ref leaf) const { + return leaf; + } virtual Ref finish_create_leaf(CellBuilder& cb, const CellSlice& value) const; virtual Ref finish_create_fork(CellBuilder& cb, Ref c1, Ref c2, int n) const; virtual bool check_fork(CellSlice& cs, Ref c1, Ref c2, int n) const { @@ -254,6 +283,7 @@ class DictionaryFixed : public DictionaryBase { return check_leaf(cs_ref.write(), key, key_len); } bool check_fork_raw(Ref cs_ref, int n) const; + friend class DictIterator; private: std::pair, Ref> dict_lookup_delete(Ref dict, td::ConstBitPtr key, int n) const; @@ -272,6 +302,148 @@ class DictionaryFixed : public DictionaryBase { const foreach_func_t& foreach_func, bool invert_first = false) const; }; +class DictIterator { + const DictionaryFixed* dict_{nullptr}; + Ref root_; + int label_mode_{dict::LabelParser::chk_size}; + int key_bits_; + int flags_; + int order_; + unsigned char key_buffer[DictionaryBase::max_key_bytes]; + bool prevalidate(int mode = -1); + enum { f_valid = 4 }; + + protected: + struct Fork { + Ref next, alt; + int pos; + bool v; + Fork() : pos(-1) { + } + Fork(Ref _next, Ref _alt, int _pos, bool _v) + : next(std::move(_next)), alt(std::move(_alt)), pos(_pos), v(_v) { + } + void rotate(td::BitPtr key) { + std::swap(next, alt); + key[pos] = (v ^= true); + } + }; + std::vector path_; + Ref leaf_; + + td::BitPtr key(int offs = 0) { + return td::BitPtr{key_buffer, offs}; + } + td::ConstBitPtr key(int offs = 0) const { + return td::ConstBitPtr{key_buffer, offs}; + } + td::ConstBitPtr ckey(int offs = 0) const { + return td::ConstBitPtr{key_buffer, offs}; + } + + public: + DictIterator() : key_bits_(0), flags_(0), order_(0) { + } + // mode: 0 = bidir, +4 = fwd only, +8 = back only; +1 = reverse directions, +2 = signed int keys + enum { it_reverse = 1, it_signed = 2 }; + DictIterator(Ref root_cell, int key_bits, int mode = 0) + : root_(std::move(root_cell)), key_bits_(key_bits), flags_(mode >> 2) { + prevalidate(mode & 3); + } + DictIterator(const DictionaryFixed& dict, int mode = 0) + : DictIterator(dict.get_root_cell(), dict.get_key_bits(), mode) { + dict_ = &dict; + label_mode_ = dict.label_mode(); + } + bool is_valid() const { + return flags_ & f_valid; + } + bool eof() const { + return leaf_.is_null(); + } + bool reset() { + dict_ = nullptr; + root_.clear(); + path_.clear(); + leaf_.clear(); + return true; + } + td::ConstBitPtr cur_pos() const { + return eof() ? td::ConstBitPtr{nullptr} : key(); + } + Ref get_root_cell() const { + return root_; + } + int get_key_bits() const { + return key_bits_; + } + bool is_bound() const { + return dict_; + } + bool is_bound_to(const DictionaryFixed& dict) const { + return root_.not_null() == dict.get_root_cell().not_null() && + (root_.not_null() ? root_.get() == dict.get_root_cell().get() : key_bits_ == dict.get_key_bits()); + } + bool bind(const DictionaryFixed& dict, int do_rewind = 0); + bool rebind_to(const DictionaryFixed& dict, int do_rewind = 0); + bool rewind(bool to_end = false); + bool next(bool backw = false); + bool prev() { + return next(true); + } + bool lookup(td::ConstBitPtr pos, int pos_bits, bool strict_after = false, bool backw = false); + template + bool lookup(const T& key, bool strict_after = false, bool backw = false) { + return lookup(key.bits(), key.size(), strict_after, backw); + } + Ref cur_value() const { + return dict_ ? dict_->extract_leaf_value(leaf_) : Ref{}; + } + Ref cur_value_raw() const { + return leaf_; + } + std::pair> operator*() const { + return std::make_pair(cur_pos(), cur_value()); + } + bool bound_to_same(const DictIterator& other) const { + return dict_ && dict_ == other.dict_; + } + bool operator==(const DictIterator& other) const { + return bound_to_same(other) && eof() == other.eof() && (eof() || key().equals(other.key(), key_bits_)); + } + int compare_keys(td::ConstBitPtr a, td::ConstBitPtr b) const; + bool operator<(const DictIterator& other) const { + return bound_to_same(other) && !eof() && (other.eof() || compare_keys(key(), other.key()) < 0); + } + bool operator!=(const DictIterator& other) const { + return !(operator==(other)); + } + bool operator>(const DictIterator& other) const { + return other < *this; + } + DictIterator& operator++() { + next(); + return *this; + } + DictIterator& operator--() { + next(true); + return *this; + } + + private: + bool dive(int mode); +}; + +template +DictIterator begin(std::pair dictm) { + return dictm.first.make_iterator(dictm.second); +} + +template +DictIterator end(std::pair dictm) { + return dictm.first.null_iterator(); +} + class Dictionary final : public DictionaryFixed { public: typedef std::function)> simple_map_func_t; @@ -351,6 +523,9 @@ class Dictionary final : public DictionaryFixed { Ref lookup_set_builder(const T& key, Ref val_ref, SetMode mode = SetMode::Set) { return lookup_set_builder(key.bits(), key.size(), std::move(val_ref), mode); } + auto range(bool rev = false, bool sgnd = false) { + return dict_range(*this, rev, sgnd); + } private: bool check_fork(CellSlice& cs, Ref c1, Ref c2, int n) const override { @@ -449,6 +624,9 @@ class AugmentedDictionary final : public DictionaryFixed { Ref lookup_delete_ref(const T& key) { return lookup_delete_ref(key.bits(), key.size()); } + auto range(bool rev = false, bool sgnd = false) { + return dict_range(*this, rev, sgnd); + } Ref extract_value(Ref value_extra) const; Ref extract_value_ref(Ref value_extra) const; @@ -458,6 +636,7 @@ class AugmentedDictionary final : public DictionaryFixed { private: bool compute_root() const; Ref get_node_extra(Ref cell_ref, int n) const; + Ref extract_leaf_value(Ref leaf) const override; bool check_leaf(CellSlice& cs, td::ConstBitPtr key, int key_len) const override; bool check_fork(CellSlice& cs, Ref c1, Ref c2, int n) const override; Ref finish_create_leaf(CellBuilder& cb, const CellSlice& value) const override; diff --git a/submodules/ton/tonlib-src/crypto/vm/dictops.cpp b/submodules/ton/tonlib-src/crypto/vm/dictops.cpp index 9f4faed9c6..c798b33397 100644 --- a/submodules/ton/tonlib-src/crypto/vm/dictops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/dictops.cpp @@ -14,14 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include "vm/log.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" +#include "vm/vm.h" #include "common/bigint.hpp" #include "common/refint.h" #include "vm/dictops.h" @@ -210,7 +210,7 @@ int exec_dict_get(VmState* st, unsigned args) { BitSlice key; unsigned char buffer[Dictionary::max_key_bytes]; if (args & 4) { - key = dict.integer_key(stack.pop_int(), n, !(args & 2), buffer, true); + key = dict.integer_key(stack.pop_int_finite(), n, !(args & 2), buffer, true); if (!key.is_valid()) { stack.push_smallint(0); return 0; @@ -250,7 +250,7 @@ int exec_dict_get_optref(VmState* st, unsigned args) { BitSlice key; unsigned char buffer[Dictionary::max_key_bytes]; if (args & 2) { - key = dict.integer_key(stack.pop_int(), n, !(args & 1), buffer, true); + key = dict.integer_key(stack.pop_int_finite(), n, !(args & 1), buffer, true); if (!key.is_valid()) { stack.push_null(); return 0; @@ -377,7 +377,7 @@ int exec_dict_delete(VmState* st, unsigned args) { BitSlice key; unsigned char buffer[Dictionary::max_key_bytes]; if (args & 2) { - key = dict.integer_key(stack.pop_int(), n, !(args & 1), buffer); + key = dict.integer_key(stack.pop_int_finite(), n, !(args & 1), buffer); if (!key.is_valid()) { push_dict(stack, std::move(dict)); stack.push_smallint(0); @@ -404,7 +404,7 @@ int exec_dict_deleteget(VmState* st, unsigned args) { BitSlice key; unsigned char buffer[Dictionary::max_key_bytes]; if (args & 4) { - key = dict.integer_key(stack.pop_int(), n, !(args & 2), buffer); + key = dict.integer_key(stack.pop_int_finite(), n, !(args & 2), buffer); if (!key.is_valid()) { push_dict(stack, std::move(dict)); stack.push_smallint(0); @@ -588,23 +588,29 @@ int exec_pfx_dict_delete(VmState* st) { int exec_dict_get_exec(VmState* st, unsigned args) { Stack& stack = st->get_stack(); - VM_LOG(st) << "execute DICT" << (args & 1 ? 'U' : 'I') << "GET" << (args & 2 ? "EXEC\n" : "JMP\n"); + VM_LOG(st) << "execute DICT" << (args & 1 ? 'U' : 'I') << "GET" << (args & 2 ? "EXEC" : "JMP") + << (args & 4 ? "Z" : ""); stack.check_underflow(3); int n = stack.pop_smallint_range(Dictionary::max_key_bits); Dictionary dict{stack.pop_maybe_cell(), n}; unsigned char buffer[Dictionary::max_key_bytes]; - dict.integer_key_simple(stack.pop_int(), n, !(args & 1), td::BitPtr{buffer}); - auto value = dict.lookup(td::BitPtr{buffer}, n); - if (value.not_null()) { - Ref cont{true, std::move(value), st->get_cp()}; - return (args & 2) ? st->call(std::move(cont)) : st->jump(std::move(cont)); - } else { - return 0; + auto idx = stack.pop_int_finite(); + if (dict.integer_key_simple(idx, n, !(args & 1), td::BitPtr{buffer}, true)) { + auto value = dict.lookup(td::BitPtr{buffer}, n); + if (value.not_null()) { + Ref cont{true, std::move(value), st->get_cp()}; + return (args & 2) ? st->call(std::move(cont)) : st->jump(std::move(cont)); + } } + // key not found or out of range + if (args & 4) { + stack.push_int(std::move(idx)); + } + return 0; } std::string dump_dict_get_exec(CellSlice& cs, unsigned args) { - return std::string{"DICT"} + (args & 1 ? 'U' : 'I') + "GET" + (args & 2 ? "EXEC" : "JMP"); + return std::string{"DICT"} + (args & 1 ? 'U' : 'I') + "GET" + (args & 2 ? "EXEC" : "JMP") + (args & 4 ? "Z" : ""); } int exec_push_const_dict(VmState* st, CellSlice& cs, unsigned args, int pfx_bits) { @@ -720,7 +726,7 @@ int exec_subdict_get(VmState* st, unsigned args) { BitSlice key; unsigned char buffer[Dictionary::max_key_bytes]; if (args & 2) { - key = dict.integer_key(stack.pop_int(), k, !(args & 1), buffer, true); + key = dict.integer_key(stack.pop_int_finite(), k, !(args & 1), buffer, true); } else { key = stack.pop_cellslice()->prefetch_bits(k); } @@ -805,7 +811,8 @@ void register_dictionary_ops(OpcodeTable& cp0) { exec_const_pfx_dict_switch, compute_len_push_const_dict)) .insert(OpcodeInstr::mkfixedrange(0xf4b1, 0xf4b4, 16, 3, std::bind(dump_subdictop2, _2, "GET"), exec_subdict_get)) .insert( - OpcodeInstr::mkfixedrange(0xf4b5, 0xf4b8, 16, 3, std::bind(dump_subdictop2, _2, "RPGET"), exec_subdict_get)); + OpcodeInstr::mkfixedrange(0xf4b5, 0xf4b8, 16, 3, std::bind(dump_subdictop2, _2, "RPGET"), exec_subdict_get)) + .insert(OpcodeInstr::mkfixed(0xf4bc >> 2, 14, 2, dump_dict_get_exec, exec_dict_get_exec)); } } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/log.h b/submodules/ton/tonlib-src/crypto/vm/log.h index e063141135..30ace2c479 100644 --- a/submodules/ton/tonlib-src/crypto/vm/log.h +++ b/submodules/ton/tonlib-src/crypto/vm/log.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -33,6 +33,12 @@ struct VmLog { td::LogOptions log_options{td::log_options}; enum { DumpStack = 2 }; int log_mask{1}; + static VmLog Null() { + VmLog res; + res.log_options.level = 0; + res.log_mask = 0; + return res; + } }; template diff --git a/submodules/ton/tonlib-src/crypto/vm/memo.cpp b/submodules/ton/tonlib-src/crypto/vm/memo.cpp new file mode 100644 index 0000000000..576f28f193 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/vm/memo.cpp @@ -0,0 +1,33 @@ +/* + 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 . + + Copyright 2020 Telegram Systems LLP +*/ +#include "vm/memo.h" +#include "vm/excno.hpp" + +namespace vm { +using td::Ref; + +bool FakeVmStateLimits::register_op(int op_units) { + bool ok = (ops_remaining -= op_units) >= 0; + if (!ok && !quiet) { + throw VmError{Excno::out_of_gas, "too many operations"}; + } + return ok; +} + +} // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/memo.h b/submodules/ton/tonlib-src/crypto/vm/memo.h new file mode 100644 index 0000000000..3aee39a6b6 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/vm/memo.h @@ -0,0 +1,37 @@ +/* + 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 . + + Copyright 2020 Telegram Systems LLP +*/ +#pragma once +#include "common/refcnt.hpp" +#include "vm/cells.h" +#include "vm/vmstate.h" + +namespace vm { +using td::Ref; + +class FakeVmStateLimits : public VmStateInterface { + long long ops_remaining; + bool quiet; + + public: + FakeVmStateLimits(long long max_ops = 1LL << 62, bool _quiet = true) : ops_remaining(max_ops), quiet(_quiet) { + } + bool register_op(int op_units = 1) override; +}; + +} // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/opctable.cpp b/submodules/ton/tonlib-src/crypto/vm/opctable.cpp index fbdc2578c1..d4f0f3e977 100644 --- a/submodules/ton/tonlib-src/crypto/vm/opctable.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/opctable.cpp @@ -14,14 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include #include "vm/opctable.h" #include "vm/cellslice.h" #include "vm/excno.hpp" -#include "vm/continuation.h" +#include "vm/vm.h" #include #include #include diff --git a/submodules/ton/tonlib-src/crypto/vm/stack.cpp b/submodules/ton/tonlib-src/crypto/vm/stack.cpp index 0b63aec9cc..43099927d5 100644 --- a/submodules/ton/tonlib-src/crypto/vm/stack.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/stack.cpp @@ -14,12 +14,13 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/stack.hpp" #include "vm/continuation.h" #include "vm/box.hpp" #include "vm/atom.h" +#include "vm/vmstate.h" namespace td { template class td::Cnt; @@ -45,6 +46,18 @@ const char* get_exception_msg(Excno exc_no) { } } +bool StackEntry::is_list(const StackEntry* se) { + Ref tuple; + while (!se->empty()) { + tuple = se->as_tuple_range(2, 2); + if (tuple.is_null()) { + return false; + } + se = &tuple->at(1); + } + return true; +} + static const char HEX_digits[] = "0123456789ABCDEF"; std::string str_to_hex(std::string data, std::string prefix) { @@ -62,6 +75,12 @@ std::string StackEntry::to_string() const { return std::move(os).str(); } +std::string StackEntry::to_lisp_string() const { + std::ostringstream os; + print_list(os); + return std::move(os).str(); +} + void StackEntry::dump(std::ostream& os) const { switch (tp) { case t_null: @@ -130,6 +149,12 @@ void StackEntry::print_list(std::ostream& os) const { break; case t_tuple: { const auto& tuple = *static_cast>(ref); + if (is_list()) { + os << '('; + tuple[0].print_list(os); + print_list_tail(os, &tuple[1]); + break; + } auto n = tuple.size(); if (!n) { os << "[]"; @@ -137,7 +162,7 @@ void StackEntry::print_list(std::ostream& os) const { os << "["; tuple[0].print_list(os); os << "]"; - } else if (n != 2) { + } else { os << "["; unsigned c = 0; for (const auto& entry : tuple) { @@ -147,10 +172,6 @@ void StackEntry::print_list(std::ostream& os) const { entry.print_list(os); } os << ']'; - } else { - os << '('; - tuple[0].print_list(os); - tuple[1].print_list_tail(os); } break; } @@ -159,26 +180,40 @@ void StackEntry::print_list(std::ostream& os) const { } } -void StackEntry::print_list_tail(std::ostream& os) const { - switch (tp) { - case t_null: - os << ')'; - break; - case t_tuple: { - const auto& tuple = *static_cast>(ref); - if (tuple.size() == 2) { - os << ' '; - tuple[0].print_list(os); - tuple[1].print_list_tail(os); - break; - } - } - // fall through - default: +void StackEntry::print_list_tail(std::ostream& os, const StackEntry* se) { + Ref tuple; + while (!se->empty()) { + tuple = se->as_tuple_range(2, 2); + if (tuple.is_null()) { os << " . "; - print_list(os); - os << ')'; + se->print_list(os); + break; + } + os << ' '; + tuple->at(0).print_list(os); + se = &tuple->at(1); } + os << ')'; +} + +StackEntry StackEntry::make_list(std::vector&& elems) { + StackEntry tail; + std::size_t n = elems.size(); + while (n > 0) { + --n; + tail = StackEntry{vm::make_tuple_ref(std::move(elems[n]), tail)}; + } + return tail; +} + +StackEntry StackEntry::make_list(const std::vector& elems) { + StackEntry tail; + std::size_t n = elems.size(); + while (n > 0) { + --n; + tail = StackEntry{vm::make_tuple_ref(elems[n], tail)}; + } + return tail; } StackEntry::StackEntry(Ref stack_ref) : ref(std::move(stack_ref)), tp(t_stack) { @@ -521,7 +556,7 @@ void Stack::push_int_quiet(td::RefInt256 val, bool quiet) { if (!quiet) { throw VmError{Excno::int_ov}; } else if (val->is_valid()) { - push(td::RefInt256{true}); + push(td::make_refint()); return; } } @@ -557,7 +592,7 @@ void Stack::push_builder(Ref cb) { } void Stack::push_smallint(long long val) { - push(td::RefInt256{true, val}); + push(td::make_refint(val)); } void Stack::push_bool(bool val) { @@ -611,13 +646,21 @@ Ref Stack::split_top(unsigned top_cnt, unsigned drop_cnt) { return new_stk; } -void Stack::dump(std::ostream& os, bool cr) const { +void Stack::dump(std::ostream& os, int mode) const { os << " [ "; - for (const auto& x : stack) { - os << x.to_string() << ' '; + if (mode & 2) { + for (const auto& x : stack) { + x.print_list(os); + os << ' '; + } + } else { + for (const auto& x : stack) { + x.dump(os); + os << ' '; + } } os << "] "; - if (cr) { + if (mode & 1) { os << std::endl; } } @@ -629,4 +672,252 @@ void Stack::push_maybe_cellslice(Ref cs) { push_maybe(std::move(cs)); } +/* + * + * SERIALIZE/DESERIALIZE STACK VALUES + * + */ + +bool StackEntry::serialize(vm::CellBuilder& cb, int mode) const { + auto* vsi = VmStateInterface::get(); + if (vsi && !vsi->register_op()) { + return false; + } + switch (tp) { + case t_null: + return cb.store_long_bool(0, 8); // vm_stk_null#00 = VmStackValue; + case t_int: { + auto val = as_int(); + if (!val->is_valid()) { + // vm_stk_nan#02ff = VmStackValue; + return cb.store_long_bool(0x02ff, 16); + } else if (!(mode & 1) && val->signed_fits_bits(64)) { + // vm_stk_tinyint#01 value:int64 = VmStackValue; + return cb.store_long_bool(1, 8) && cb.store_int256_bool(std::move(val), 64); + } else { + // vm_stk_int#0201_ value:int257 = VmStackValue; + return cb.store_long_bool(0x0200 / 2, 15) && cb.store_int256_bool(std::move(val), 257); + } + } + case t_cell: + // vm_stk_cell#03 cell:^Cell = VmStackValue; + return cb.store_long_bool(3, 8) && cb.store_ref_bool(as_cell()); + case t_slice: { + // _ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits } + // st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice; + const auto& cs = *static_cast>(ref); + return ((mode & 0x1000) || cb.store_long_bool(4, 8)) // vm_stk_slice#04 _:VmCellSlice = VmStackValue; + && cb.store_ref_bool(cs.get_base_cell()) // _ cell:^Cell + && cb.store_long_bool(cs.cur_pos(), 10) // st_bits:(## 10) + && cb.store_long_bool(cs.cur_pos() + cs.size(), 10) // end_bits:(## 10) + && cb.store_long_bool(cs.cur_ref(), 3) // st_ref:(#<= 4) + && cb.store_long_bool(cs.cur_ref() + cs.size_refs(), 3); // end_ref:(#<= 4) + } + case t_builder: + // vm_stk_builder#05 cell:^Cell = VmStackValue; + return cb.store_long_bool(5, 8) && cb.store_ref_bool(as_builder()->finalize_copy()); + case t_vmcont: + // vm_stk_cont#06 cont:VmCont = VmStackValue; + return !(mode & 2) && cb.store_long_bool(6, 8) && as_cont()->serialize(cb); + case t_tuple: { + const auto& tuple = *static_cast>(ref); + auto n = tuple.size(); + // vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue; + Ref head, tail; + vm::CellBuilder cb2; + for (std::size_t i = 0; i < n; i++) { + std::swap(head, tail); + if (i > 1 && + !(cb2.store_ref_bool(std::move(tail)) && cb2.store_ref_bool(std::move(head)) && cb2.finalize_to(head))) { + return false; + } + if (!(tuple[i].serialize(cb2, mode) && cb2.finalize_to(tail))) { + return false; + } + } + return cb.store_long_bool(7, 8) && cb.store_long_bool(n, 16) && (head.is_null() || cb.store_ref_bool(head)) && + (tail.is_null() || cb.store_ref_bool(tail)); + } + default: + return false; + } +} + +bool StackEntry::deserialize(CellSlice& cs, int mode) { + auto* vsi = VmStateInterface::get(); + if (vsi && !vsi->register_op()) { + return false; + } + clear(); + int t = (mode & 0xf000) ? ((mode >> 12) & 15) : (int)cs.prefetch_ulong(8); + switch (t) { + case 0: + // vm_stk_null#00 = VmStackValue; + return cs.advance(8); + case 1: { + // vm_stk_tinyint#01 value:int64 = VmStackValue; + td::RefInt256 val; + return !(mode & 1) && cs.advance(8) && cs.fetch_int256_to(64, val) && set_int(std::move(val)); + } + case 2: { + t = (int)cs.prefetch_ulong(16) & 0x1ff; + if (t == 0xff) { + // vm_stk_nan#02ff = VmStackValue; + return cs.advance(16) && set_int(td::make_refint()); + } else { + // vm_stk_int#0201_ value:int257 = VmStackValue; + td::RefInt256 val; + return cs.fetch_ulong(15) == 0x0200 / 2 && cs.fetch_int256_to(257, val) && set_int(std::move(val)); + } + } + case 3: { + // vm_stk_cell#03 cell:^Cell = VmStackValue; + return cs.have_refs() && cs.advance(8) && set(t_cell, cs.fetch_ref()); + } + case 4: { + // _ cell:^Cell st_bits:(## 10) end_bits:(## 10) { st_bits <= end_bits } + // st_ref:(#<= 4) end_ref:(#<= 4) { st_ref <= end_ref } = VmCellSlice; + // vm_stk_slice#04 _:VmCellSlice = VmStackValue; + unsigned st_bits, end_bits, st_ref, end_ref; + Ref cell; + Ref csr; + return ((mode & 0xf000) || cs.advance(8)) // vm_stk_slice#04 + && cs.fetch_ref_to(cell) // cell:^Cell + && cs.fetch_uint_to(10, st_bits) // st_bits:(## 10) + && cs.fetch_uint_to(10, end_bits) // end_bits:(## 10) + && st_bits <= end_bits // { st_bits <= end_bits } + && cs.fetch_uint_to(3, st_ref) // st_ref:(#<= 4) + && cs.fetch_uint_to(3, end_ref) // end_ref:(#<= 4) + && st_ref <= end_ref && end_ref <= 4 // { st_ref <= end_ref } + && (csr = load_cell_slice_ref(std::move(cell))).not_null() // load cell slice + && csr->have(end_bits, end_ref) && + csr.write().skip_last(csr->size() - end_bits, csr->size_refs() - end_ref) && + csr.write().skip_first(st_bits, st_ref) && set(t_slice, std::move(csr)); + } + case 5: { + // vm_stk_builder#05 cell:^Cell = VmStackValue; + Ref cell; + Ref csr; + Ref cb{true}; + return cs.advance(8) && cs.fetch_ref_to(cell) && (csr = load_cell_slice_ref(std::move(cell))).not_null() && + cb.write().append_cellslice_bool(std::move(csr)) && set(t_builder, std::move(cb)); + } + case 6: { + // vm_stk_cont#06 cont:VmCont = VmStackValue; + Ref cont; + return !(mode & 2) && cs.advance(8) && Continuation::deserialize_to(cs, cont, mode) && + set(t_vmcont, std::move(cont)); + } + case 7: { + // vm_stk_tuple#07 len:(## 16) data:(VmTuple len) = VmStackValue; + int n; + if (!(cs.advance(8) && cs.fetch_uint_to(16, n))) { + return false; + } + Ref tuple{true, n}; + auto& t = tuple.write(); + if (n > 1) { + Ref head, tail; + n--; + if (!(cs.fetch_ref_to(head) && cs.fetch_ref_to(tail) && t[n].deserialize(std::move(tail), mode))) { + return false; + } + vm::CellSlice cs2; + while (--n > 0) { + if (!(cs2.load(std::move(head)) && cs2.fetch_ref_to(head) && cs2.fetch_ref_to(tail) && cs2.empty_ext() && + t[n].deserialize(std::move(tail), mode))) { + return false; + } + } + if (!t[0].deserialize(std::move(head), mode)) { + return false; + } + } else if (n == 1) { + return cs.have_refs() && t[0].deserialize(cs.fetch_ref(), mode) && set(t_tuple, std::move(tuple)); + } + return set(t_tuple, std::move(tuple)); + } + default: + return false; + } +} + +bool StackEntry::deserialize(Ref cell, int mode) { + if (cell.is_null()) { + clear(); + return false; + } + CellSlice cs = load_cell_slice(std::move(cell)); + return deserialize(cs, mode) && cs.empty_ext(); +} + +bool Stack::serialize(vm::CellBuilder& cb, int mode) const { + auto* vsi = VmStateInterface::get(); + if (vsi && !vsi->register_op()) { + return false; + } + // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack; + unsigned n = depth(); + if (!cb.store_ulong_rchk_bool(n, 24)) { // vm_stack#_ depth:(## 24) + return false; + } + if (!n) { + return true; + } + vm::CellBuilder cb2; + Ref rest = cb2.finalize(); // vm_stk_nil#_ = VmStackList 0; + for (unsigned i = 0; i < n - 1; i++) { + // vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1); + if (!(cb2.store_ref_bool(std::move(rest)) && stack[i].serialize(cb2, mode) && cb2.finalize_to(rest))) { + return false; + } + } + return cb.store_ref_bool(std::move(rest)) && stack[n - 1].serialize(cb, mode); +} + +bool Stack::deserialize(vm::CellSlice& cs, int mode) { + auto* vsi = VmStateInterface::get(); + if (vsi && !vsi->register_op()) { + return false; + } + clear(); + // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack; + int n; + if (!cs.fetch_uint_to(24, n)) { + return false; + } + if (!n) { + return true; + } + stack.resize(n); + Ref rest; + if (!(cs.fetch_ref_to(rest) && stack[n - 1].deserialize(cs, mode))) { + clear(); + return false; + } + for (int i = n - 2; i >= 0; --i) { + // vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1); + vm::CellSlice cs2 = load_cell_slice(std::move(rest)); + if (!(cs2.fetch_ref_to(rest) && stack[i].deserialize(cs2, mode) && cs2.empty_ext())) { + clear(); + return false; + } + } + if (!load_cell_slice(std::move(rest)).empty_ext()) { + clear(); + return false; + } + return true; +} + +bool Stack::deserialize_to(vm::CellSlice& cs, Ref& stack, int mode) { + stack = Ref{true}; + if (stack.unique_write().deserialize(cs, mode)) { + return true; + } else { + stack.clear(); + return false; + } +} + } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/stack.hpp b/submodules/ton/tonlib-src/crypto/vm/stack.hpp index 0b16f59c39..3fadce6b27 100644 --- a/submodules/ton/tonlib-src/crypto/vm/stack.hpp +++ b/submodules/ton/tonlib-src/crypto/vm/stack.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -57,6 +57,11 @@ class Atom; using Tuple = td::Cnt>; +template +Ref make_tuple_ref(Args&&... args) { + return td::make_cnt_ref>(std::vector{std::forward(args)...}); +} + struct from_object_t {}; constexpr from_object_t from_object{}; @@ -130,6 +135,9 @@ class StackEntry { tp = t_null; return *this; } + bool set_int(td::RefInt256 value) { + return set(t_int, std::move(value)); + } bool empty() const { return tp == t_null; } @@ -139,9 +147,24 @@ class StackEntry { bool is_atom() const { return tp == t_atom; } + bool is_int() const { + return tp == t_int; + } + bool is_cell() const { + return tp == t_cell; + } + bool is_null() const { + return tp == t_null; + } bool is(int wanted) const { return tp == wanted; } + bool is_list() const { + return is_list(this); + } + static bool is_list(const StackEntry& se) { + return is_list(&se); + } void swap(StackEntry& se) { ref.swap(se.ref); std::swap(tp, se.tp); @@ -155,10 +178,15 @@ class StackEntry { Type type() const { return tp; } + // mode: +1 = disable short ints, +2 = disable continuations + bool serialize(vm::CellBuilder& cb, int mode = 0) const; + bool deserialize(vm::CellSlice& cs, int mode = 0); + bool deserialize(Ref cell, int mode = 0); private: + static bool is_list(const StackEntry* se); template - Ref dynamic_as() const& { + Ref dynamic_as() const & { return tp == tag ? static_cast>(ref) : td::Ref{}; } template @@ -170,7 +198,7 @@ class StackEntry { return tp == tag ? static_cast>(std::move(ref)) : td::Ref{}; } template - Ref as() const& { + Ref as() const & { return tp == tag ? Ref{td::static_cast_ref(), ref} : td::Ref{}; } template @@ -181,8 +209,19 @@ class StackEntry { Ref move_as() & { return tp == tag ? Ref{td::static_cast_ref(), std::move(ref)} : td::Ref{}; } + bool set(Type _tp, RefAny _ref) { + tp = _tp; + ref = std::move(_ref); + return ref.not_null() || tp == t_null; + } public: + static StackEntry make_list(std::vector&& elems); + static StackEntry make_list(const std::vector& elems); + template + static StackEntry cons(T1&& x, T2&& y) { + return StackEntry{make_tuple_ref(std::forward(x), std::forward(y))}; + } template static StackEntry maybe(Ref ref) { if (ref.is_null()) { @@ -191,31 +230,31 @@ class StackEntry { return ref; } } - td::RefInt256 as_int() const& { + td::RefInt256 as_int() const & { return as(); } td::RefInt256 as_int() && { return move_as(); } - Ref as_cell() const& { + Ref as_cell() const & { return as(); } Ref as_cell() && { return move_as(); } - Ref as_builder() const& { + Ref as_builder() const & { return as(); } Ref as_builder() && { return move_as(); } - Ref as_slice() const& { + Ref as_slice() const & { return as(); } Ref as_slice() && { return move_as(); } - Ref as_cont() const&; + Ref as_cont() const &; Ref as_cont() &&; Ref> as_string_ref() const { return as, t_string>(); @@ -230,16 +269,16 @@ class StackEntry { std::string as_bytes() const { return tp == t_bytes ? *as_bytes_ref() : ""; } - Ref as_box() const&; + Ref as_box() const &; Ref as_box() &&; - Ref as_tuple() const&; + Ref as_tuple() const &; Ref as_tuple() &&; - Ref as_tuple_range(unsigned max_len = 255, unsigned min_len = 0) const&; + Ref as_tuple_range(unsigned max_len = 255, unsigned min_len = 0) const &; Ref as_tuple_range(unsigned max_len = 255, unsigned min_len = 0) &&; - Ref as_atom() const&; + Ref as_atom() const &; Ref as_atom() &&; template - Ref as_object() const& { + Ref as_object() const & { return dynamic_as(); } template @@ -248,19 +287,17 @@ class StackEntry { } void dump(std::ostream& os) const; void print_list(std::ostream& os) const; - void print_list_tail(std::ostream& os) const; std::string to_string() const; + std::string to_lisp_string() const; + + private: + static void print_list_tail(std::ostream& os, const StackEntry* se); }; inline void swap(StackEntry& se1, StackEntry& se2) { se1.swap(se2); } -template -Ref make_tuple_ref(Args&&... args) { - return td::make_cnt_ref>(std::vector{std::forward(args)...}); -} - const StackEntry& tuple_index(const Tuple& tup, unsigned idx); StackEntry tuple_extend_index(const Ref& tup, unsigned idx); unsigned tuple_extend_set_index(Ref& tup, unsigned idx, StackEntry&& value, bool force = false); @@ -320,6 +357,10 @@ class Stack : public td::CntObject { void pop_many(int count) { stack.resize(stack.size() - count); } + void pop_many(int count, int offs) { + std::move(stack.cend() - offs, stack.cend(), stack.end() - (count + offs)); + pop_many(count); + } void drop_bottom(int count) { std::move(stack.cbegin() + count, stack.cend(), stack.begin()); pop_many(count); @@ -401,6 +442,12 @@ class Stack : public td::CntObject { } return *this; } + std::vector extract_contents() const & { + return stack; + } + std::vector extract_contents() && { + return std::move(stack); + } template const Stack& check_underflow(Args... args) const { if (!at_least(args...)) { @@ -453,6 +500,18 @@ class Stack : public td::CntObject { Ref pop_atom(); std::string pop_string(); std::string pop_bytes(); + template + Ref pop_object() { + return pop_chk().as_object(); + } + template + Ref pop_object_type_chk() { + auto res = pop_object(); + if (!res) { + throw VmError{Excno::type_chk, "not an object of required type"}; + } + return res; + } void push_null(); void push_int(td::RefInt256 val); void push_int_quiet(td::RefInt256 val, bool quiet = true); @@ -490,7 +549,11 @@ class Stack : public td::CntObject { push(std::move(val)); } } - void dump(std::ostream& os, bool cr = true) const; + // mode: +1 = add eoln, +2 = Lisp-style lists + void dump(std::ostream& os, int mode = 1) const; + bool serialize(vm::CellBuilder& cb, int mode = 0) const; + bool deserialize(vm::CellSlice& cs, int mode = 0); + static bool deserialize_to(vm::CellSlice& cs, Ref& stack, int mode = 0); }; } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/stackops.cpp b/submodules/ton/tonlib-src/crypto/vm/stackops.cpp index 7fdbcba044..0f5be6d402 100644 --- a/submodules/ton/tonlib-src/crypto/vm/stackops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/stackops.cpp @@ -14,14 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/log.h" #include "vm/stackops.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" +#include "vm/vm.h" namespace vm { @@ -379,6 +379,15 @@ int exec_blkdrop(VmState* st, unsigned args) { return 0; } +int exec_blkdrop2(VmState* st, unsigned args) { + int x = ((args >> 4) & 15), y = (args & 15); + Stack& stack = st->get_stack(); + VM_LOG(st) << "execute BLKDROP2 " << x << ',' << y; + stack.check_underflow(x + y); + stack.pop_many(x, y); + return 0; +} + int exec_blkpush(VmState* st, unsigned args) { int x = ((args >> 4) & 15), y = (args & 15); Stack& stack = st->get_stack(); @@ -570,7 +579,8 @@ void register_stack_ops(OpcodeTable& cp0) { .insert(OpcodeInstr::mksimple(0x68, 8, "DEPTH", exec_depth)) .insert(OpcodeInstr::mksimple(0x69, 8, "CHKDEPTH", exec_chkdepth)) .insert(OpcodeInstr::mksimple(0x6a, 8, "ONLYTOPX", exec_onlytop_x)) - .insert(OpcodeInstr::mksimple(0x6b, 8, "ONLYX", exec_only_x)); + .insert(OpcodeInstr::mksimple(0x6b, 8, "ONLYX", exec_only_x)) + .insert(OpcodeInstr::mkfixedrange(0x6c10, 0x6d00, 16, 8, instr::dump_2c("BLKDROP2 ", ","), exec_blkdrop2)); } } // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/tonops.cpp b/submodules/ton/tonlib-src/crypto/vm/tonops.cpp index e2142f072f..ca8e4b009f 100644 --- a/submodules/ton/tonlib-src/crypto/vm/tonops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/tonops.cpp @@ -14,15 +14,15 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include #include "vm/tonops.h" #include "vm/log.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" +#include "vm/vm.h" #include "vm/dict.h" #include "Ed25519.h" @@ -77,7 +77,7 @@ int exec_set_gas_limit(VmState* st) { int exec_commit(VmState* st) { VM_LOG(st) << "execute COMMIT"; - st->commit(); + st->force_commit(); return 0; } @@ -165,6 +165,8 @@ int exec_set_global_common(VmState* st, unsigned idx) { if (idx >= 255) { throw VmError{Excno::range_chk, "tuple index out of range"}; } + static auto empty_tuple = Ref{true}; + st->set_c7(empty_tuple); // optimization; use only if no exception can be thrown until true set_c7() auto tpay = tuple_extend_set_index(tuple, idx, std::move(x)); if (tpay > 0) { st->consume_tuple_gas(tpay); @@ -193,7 +195,8 @@ void register_ton_config_ops(OpcodeTable& cp0) { .insert(OpcodeInstr::mksimple(0xf823, 16, "NOW", std::bind(exec_get_param, _1, 3, "NOW"))) .insert(OpcodeInstr::mksimple(0xf824, 16, "BLOCKLT", std::bind(exec_get_param, _1, 4, "BLOCKLT"))) .insert(OpcodeInstr::mksimple(0xf825, 16, "LTIME", std::bind(exec_get_param, _1, 5, "LTIME"))) - .insert(OpcodeInstr::mkfixedrange(0xf826, 0xf828, 16, 4, instr::dump_1c("GETPARAM "), exec_get_var_param)) + .insert(OpcodeInstr::mksimple(0xf826, 16, "RANDSEED", std::bind(exec_get_param, _1, 6, "RANDSEED"))) + .insert(OpcodeInstr::mksimple(0xf827, 16, "BALANCE", std::bind(exec_get_param, _1, 7, "BALANCE"))) .insert(OpcodeInstr::mksimple(0xf828, 16, "MYADDR", std::bind(exec_get_param, _1, 8, "MYADDR"))) .insert(OpcodeInstr::mksimple(0xf829, 16, "CONFIGROOT", std::bind(exec_get_param, _1, 9, "CONFIGROOT"))) .insert(OpcodeInstr::mkfixedrange(0xf82a, 0xf830, 16, 4, instr::dump_1c("GETPARAM "), exec_get_var_param)) @@ -206,6 +209,112 @@ void register_ton_config_ops(OpcodeTable& cp0) { .insert(OpcodeInstr::mkfixedrange(0xf861, 0xf880, 16, 5, instr::dump_1c_and(31, "SETGLOB "), exec_set_global)); } +static constexpr int randseed_idx = 6; + +td::RefInt256 generate_randu256(VmState* st) { + auto tuple = st->get_c7(); + auto t1 = tuple_index(*tuple, 0).as_tuple_range(255); + if (t1.is_null()) { + throw VmError{Excno::type_chk, "intermediate value is not a tuple"}; + } + auto seedv = tuple_index(*t1, randseed_idx).as_int(); + if (seedv.is_null()) { + throw VmError{Excno::type_chk, "random seed is not an integer"}; + } + unsigned char seed[32]; + if (!seedv->export_bytes(seed, 32, false)) { + throw VmError{Excno::range_chk, "random seed out of range"}; + } + unsigned char hash[64]; + digest::hash_str(hash, seed, 32); + if (!seedv.write().import_bytes(hash, 32, false)) { + throw VmError{Excno::range_chk, "cannot store new random seed"}; + } + td::RefInt256 res{true}; + if (!res.write().import_bytes(hash + 32, 32, false)) { + throw VmError{Excno::range_chk, "cannot store new random number"}; + } + static auto empty_tuple = Ref{true}; + st->set_c7(empty_tuple); // optimization; use only if no exception can be thrown until true set_c7() + tuple.write()[0].clear(); + t1.write().at(randseed_idx) = std::move(seedv); + st->consume_tuple_gas(t1); + tuple.write().at(0) = std::move(t1); + st->consume_tuple_gas(tuple); + st->set_c7(std::move(tuple)); + return res; +} + +int exec_randu256(VmState* st) { + VM_LOG(st) << "execute RANDU256"; + st->get_stack().push_int(generate_randu256(st)); + return 0; +} + +int exec_rand_int(VmState* st) { + VM_LOG(st) << "execute RAND"; + auto& stack = st->get_stack(); + stack.check_underflow(1); + auto x = stack.pop_int_finite(); + auto y = generate_randu256(st); + typename td::BigInt256::DoubleInt tmp{0}; + tmp.add_mul(*x, *y); + tmp.rshift(256, -1).normalize(); + stack.push_int(td::make_refint(tmp)); + return 0; +} + +int exec_set_rand(VmState* st, bool mix) { + VM_LOG(st) << "execute " << (mix ? "ADDRAND" : "SETRAND"); + auto& stack = st->get_stack(); + stack.check_underflow(1); + auto x = stack.pop_int_finite(); + if (!x->unsigned_fits_bits(256)) { + throw VmError{Excno::range_chk, "new random seed out of range"}; + } + auto tuple = st->get_c7(); + auto t1 = tuple_index(*tuple, 0).as_tuple_range(255); + if (t1.is_null()) { + throw VmError{Excno::type_chk, "intermediate value is not a tuple"}; + } + if (mix) { + auto seedv = tuple_index(*t1, randseed_idx).as_int(); + if (seedv.is_null()) { + throw VmError{Excno::type_chk, "random seed is not an integer"}; + } + unsigned char buffer[64], hash[32]; + if (!std::move(seedv)->export_bytes(buffer, 32, false)) { + throw VmError{Excno::range_chk, "random seed out of range"}; + } + if (!x->export_bytes(buffer + 32, 32, false)) { + throw VmError{Excno::range_chk, "mixed seed value out of range"}; + } + digest::hash_str(hash, buffer, 64); + if (!x.write().import_bytes(hash, 32, false)) { + throw VmError{Excno::range_chk, "new random seed value out of range"}; + } + } + static auto empty_tuple = Ref{true}; + st->set_c7(empty_tuple); // optimization; use only if no exception can be thrown until true set_c7() + tuple.write()[0].clear(); + auto tpay = tuple_extend_set_index(t1, randseed_idx, std::move(x)); + if (tpay > 0) { + st->consume_tuple_gas(tpay); + } + tuple.unique_write()[0] = std::move(t1); + st->consume_tuple_gas(tuple); + st->set_c7(std::move(tuple)); + return 0; +} + +void register_prng_ops(OpcodeTable& cp0) { + using namespace std::placeholders; + cp0.insert(OpcodeInstr::mksimple(0xf810, 16, "RANDU256", exec_randu256)) + .insert(OpcodeInstr::mksimple(0xf811, 16, "RAND", exec_rand_int)) + .insert(OpcodeInstr::mksimple(0xf814, 16, "SETRAND", std::bind(exec_set_rand, _1, false))) + .insert(OpcodeInstr::mksimple(0xf815, 16, "ADDRAND", std::bind(exec_set_rand, _1, true))); +} + int exec_compute_hash(VmState* st, int mode) { VM_LOG(st) << "execute HASH" << (mode & 1 ? 'S' : 'C') << 'U'; Stack& stack = st->get_stack(); @@ -288,6 +397,83 @@ void register_ton_crypto_ops(OpcodeTable& cp0) { .insert(OpcodeInstr::mksimple(0xf911, 16, "CHKSIGNS", std::bind(exec_ed25519_check_signature, _1, true))); } +struct VmStorageStat { + td::uint64 cells{0}, bits{0}, refs{0}, limit; + td::HashSet visited; + VmStorageStat(td::uint64 _limit) : limit(_limit) { + } + bool add_storage(Ref cell); + bool add_storage(const CellSlice& cs); + bool check_visited(const CellHash& cell_hash) { + return visited.insert(cell_hash).second; + } + bool check_visited(const Ref& cell) { + return check_visited(cell->get_hash()); + } +}; + +bool VmStorageStat::add_storage(Ref cell) { + if (cell.is_null() || !check_visited(cell)) { + return true; + } + if (cells >= limit) { + return false; + } + ++cells; + bool special; + auto cs = load_cell_slice_special(std::move(cell), special); + return cs.is_valid() && add_storage(std::move(cs)); +} + +bool VmStorageStat::add_storage(const CellSlice& cs) { + bits += cs.size(); + refs += cs.size_refs(); + for (unsigned i = 0; i < cs.size_refs(); i++) { + if (!add_storage(cs.prefetch_ref(i))) { + return false; + } + } + return true; +} + +int exec_compute_data_size(VmState* st, int mode) { + VM_LOG(st) << (mode & 2 ? 'S' : 'C') << "DATASIZE" << (mode & 1 ? "Q" : ""); + Stack& stack = st->get_stack(); + stack.check_underflow(2); + auto bound = stack.pop_int(); + Ref cell; + Ref cs; + if (mode & 2) { + cs = stack.pop_cellslice(); + } else { + cell = stack.pop_maybe_cell(); + } + if (!bound->is_valid() || bound->sgn() < 0) { + throw VmError{Excno::range_chk, "finite non-negative integer expected"}; + } + VmStorageStat stat{bound->unsigned_fits_bits(63) ? bound->to_long() : (1ULL << 63) - 1}; + bool ok = (mode & 2 ? stat.add_storage(cs.write()) : stat.add_storage(std::move(cell))); + if (ok) { + stack.push_smallint(stat.cells); + stack.push_smallint(stat.bits); + stack.push_smallint(stat.refs); + } else if (!(mode & 1)) { + throw VmError{Excno::cell_ov, "scanned too many cells"}; + } + if (mode & 1) { + stack.push_bool(ok); + } + return 0; +} + +void register_ton_misc_ops(OpcodeTable& cp0) { + using namespace std::placeholders; + cp0.insert(OpcodeInstr::mksimple(0xf940, 16, "CDATASIZEQ", std::bind(exec_compute_data_size, _1, 1))) + .insert(OpcodeInstr::mksimple(0xf941, 16, "CDATASIZE", std::bind(exec_compute_data_size, _1, 0))) + .insert(OpcodeInstr::mksimple(0xf942, 16, "SDATASIZEQ", std::bind(exec_compute_data_size, _1, 3))) + .insert(OpcodeInstr::mksimple(0xf943, 16, "SDATASIZE", std::bind(exec_compute_data_size, _1, 2))); +} + int exec_load_var_integer(VmState* st, int len_bits, bool sgnd, bool quiet) { if (len_bits == 4 && !sgnd) { VM_LOG(st) << "execute LDGRAMS" << (quiet ? "Q" : ""); @@ -421,15 +607,15 @@ bool parse_maybe_anycast(CellSlice& cs, StackEntry& res) { bool parse_message_addr(CellSlice& cs, std::vector& res) { res.clear(); switch ((unsigned)cs.fetch_ulong(2)) { - case 0: // addr_none$00 = MsgAddressExt; - res.emplace_back(td::RefInt256{true, 0}); // -> (0) + case 0: // addr_none$00 = MsgAddressExt; + res.emplace_back(td::zero_refint()); // -> (0) return true; case 1: { // addr_extern$01 unsigned len; Ref addr; if (cs.fetch_uint_to(9, len) // len:(## 9) && cs.fetch_subslice_to(len, addr)) { // external_address:(bits len) = MsgAddressExt; - res.emplace_back(td::RefInt256{true, 1}); + res.emplace_back(td::make_refint(1)); res.emplace_back(std::move(addr)); return true; } @@ -442,9 +628,9 @@ bool parse_message_addr(CellSlice& cs, std::vector& res) { if (parse_maybe_anycast(cs, v) // anycast:(Maybe Anycast) && cs.fetch_int_to(8, workchain) // workchain_id:int8 && cs.fetch_subslice_to(256, addr)) { // address:bits256 = MsgAddressInt; - res.emplace_back(td::RefInt256{true, 2}); + res.emplace_back(td::make_refint(2)); res.emplace_back(std::move(v)); - res.emplace_back(td::RefInt256{true, workchain}); + res.emplace_back(td::make_refint(workchain)); res.emplace_back(std::move(addr)); return true; } @@ -458,9 +644,9 @@ bool parse_message_addr(CellSlice& cs, std::vector& res) { && cs.fetch_uint_to(9, len) // addr_len:(## 9) && cs.fetch_int_to(32, workchain) // workchain_id:int32 && cs.fetch_subslice_to(len, addr)) { // address:(bits addr_len) = MsgAddressInt; - res.emplace_back(td::RefInt256{true, 3}); + res.emplace_back(td::make_refint(3)); res.emplace_back(std::move(v)); - res.emplace_back(td::RefInt256{true, workchain}); + res.emplace_back(td::make_refint(workchain)); res.emplace_back(std::move(addr)); return true; } @@ -625,26 +811,24 @@ bool store_grams(CellBuilder& cb, td::RefInt256 value) { } int exec_reserve_raw(VmState* st, int mode) { - VM_LOG(st) << "execute RESERVERAW" << (mode & 1 ? "X" : ""); + VM_LOG(st) << "execute RAWRESERVE" << (mode & 1 ? "X" : ""); Stack& stack = st->get_stack(); - stack.check_underflow(2); - int f = stack.pop_smallint_range(3); - td::RefInt256 x; - Ref csr; + stack.check_underflow(2 + (mode & 1)); + int f = stack.pop_smallint_range(15); + Ref y; if (mode & 1) { - csr = stack.pop_cellslice(); - } else { - x = stack.pop_int_finite(); - if (td::sgn(x) < 0) { - throw VmError{Excno::range_chk, "amount of nanograms must be non-negative"}; - } + y = stack.pop_maybe_cell(); + } + auto x = stack.pop_int_finite(); + if (td::sgn(x) < 0) { + throw VmError{Excno::range_chk, "amount of nanograms must be non-negative"}; } CellBuilder cb; if (!(cb.store_ref_bool(get_actions(st)) // out_list$_ {n:#} prev:^(OutList n) && cb.store_long_bool(0x36e6b809, 32) // action_reserve_currency#36e6b809 && cb.store_long_bool(f, 8) // mode:(## 8) - && (mode & 1 ? cb.append_cellslice_bool(std::move(csr)) - : (store_grams(cb, std::move(x)) && cb.store_bool_bool(false))))) { + && store_grams(cb, std::move(x)) // + && cb.store_maybe_ref(std::move(y)))) { throw VmError{Excno::cell_ov, "cannot serialize raw reserved currency amount into an output action cell"}; } return install_output_action(st, cb.finalize()); @@ -662,19 +846,58 @@ int exec_set_code(VmState* st) { return install_output_action(st, cb.finalize()); } +int exec_set_lib_code(VmState* st) { + VM_LOG(st) << "execute SETLIBCODE"; + Stack& stack = st->get_stack(); + stack.check_underflow(2); + int mode = stack.pop_smallint_range(2); + auto code = stack.pop_cell(); + CellBuilder cb; + if (!(cb.store_ref_bool(get_actions(st)) // out_list$_ {n:#} prev:^(OutList n) + && cb.store_long_bool(0x26fa1dd4, 32) // action_change_library#26fa1dd4 + && cb.store_long_bool(mode * 2 + 1, 8) // mode:(## 7) { mode <= 2 } + && cb.store_ref_bool(std::move(code)))) { // libref:LibRef = OutAction; + throw VmError{Excno::cell_ov, "cannot serialize new library code into an output action cell"}; + } + return install_output_action(st, cb.finalize()); +} + +int exec_change_lib(VmState* st) { + VM_LOG(st) << "execute CHANGELIB"; + Stack& stack = st->get_stack(); + stack.check_underflow(2); + int mode = stack.pop_smallint_range(2); + auto hash = stack.pop_int_finite(); + if (!hash->unsigned_fits_bits(256)) { + throw VmError{Excno::range_chk, "library hash must be non-negative"}; + } + CellBuilder cb; + if (!(cb.store_ref_bool(get_actions(st)) // out_list$_ {n:#} prev:^(OutList n) + && cb.store_long_bool(0x26fa1dd4, 32) // action_change_library#26fa1dd4 + && cb.store_long_bool(mode * 2, 8) // mode:(## 7) { mode <= 2 } + && cb.store_int256_bool(hash, 256, false))) { // libref:LibRef = OutAction; + throw VmError{Excno::cell_ov, "cannot serialize library hash into an output action cell"}; + } + return install_output_action(st, cb.finalize()); +} + void register_ton_message_ops(OpcodeTable& cp0) { using namespace std::placeholders; cp0.insert(OpcodeInstr::mksimple(0xfb00, 16, "SENDRAWMSG", exec_send_raw_message)) - .insert(OpcodeInstr::mksimple(0xfb02, 16, "RESERVERAW", std::bind(exec_reserve_raw, _1, 0))) - .insert(OpcodeInstr::mksimple(0xfb03, 16, "RESERVERAWX", std::bind(exec_reserve_raw, _1, 1))) - .insert(OpcodeInstr::mksimple(0xfb04, 16, "SETCODE", exec_set_code)); + .insert(OpcodeInstr::mksimple(0xfb02, 16, "RAWRESERVE", std::bind(exec_reserve_raw, _1, 0))) + .insert(OpcodeInstr::mksimple(0xfb03, 16, "RAWRESERVEX", std::bind(exec_reserve_raw, _1, 1))) + .insert(OpcodeInstr::mksimple(0xfb04, 16, "SETCODE", exec_set_code)) + .insert(OpcodeInstr::mksimple(0xfb06, 16, "SETLIBCODE", exec_set_lib_code)) + .insert(OpcodeInstr::mksimple(0xfb07, 16, "CHANGELIB", exec_change_lib)); } void register_ton_ops(OpcodeTable& cp0) { register_basic_gas_ops(cp0); register_ton_gas_ops(cp0); + register_prng_ops(cp0); register_ton_config_ops(cp0); register_ton_crypto_ops(cp0); + register_ton_misc_ops(cp0); register_ton_currency_address_ops(cp0); register_ton_message_ops(cp0); } diff --git a/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp b/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp index de4de83465..ef906f6acd 100644 --- a/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp +++ b/submodules/ton/tonlib-src/crypto/vm/tupleops.cpp @@ -14,14 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "vm/log.h" #include "vm/stackops.h" #include "vm/opctable.h" #include "vm/stack.hpp" -#include "vm/continuation.h" #include "vm/excno.hpp" +#include "vm/vm.h" namespace vm { @@ -53,6 +53,23 @@ int exec_null_swap_if(VmState* st, bool cond, int depth) { return 0; } +int exec_null_swap_if_many(VmState* st, bool cond, int depth, int count) { + Stack& stack = st->get_stack(); + VM_LOG(st) << "execute NULL" << (depth ? "ROTR" : "SWAP") << (cond ? "IF" : "IFNOT") << count; + stack.check_underflow(depth + 1); + auto x = stack.pop_int_finite(); + if (!x->sgn() != cond) { + for (int i = 0; i < count; i++) { + stack.push({}); + } + for (int i = 0; i < depth; i++) { + swap(stack[i], stack[i + count]); + } + } + stack.push_int(std::move(x)); + return 0; +} + int exec_mktuple_common(VmState* st, unsigned n) { Stack& stack = st->get_stack(); stack.check_underflow(n); @@ -374,6 +391,10 @@ void register_tuple_ops(OpcodeTable& cp0) { .insert(OpcodeInstr::mksimple(0x6fa1, 16, "NULLSWAPIFNOT", std::bind(exec_null_swap_if, _1, false, 0))) .insert(OpcodeInstr::mksimple(0x6fa2, 16, "NULLROTRIF", std::bind(exec_null_swap_if, _1, true, 1))) .insert(OpcodeInstr::mksimple(0x6fa3, 16, "NULLROTRIFNOT", std::bind(exec_null_swap_if, _1, false, 1))) + .insert(OpcodeInstr::mksimple(0x6fa4, 16, "NULLSWAPIF2", std::bind(exec_null_swap_if_many, _1, true, 0, 2))) + .insert(OpcodeInstr::mksimple(0x6fa5, 16, "NULLSWAPIFNOT2", std::bind(exec_null_swap_if_many, _1, false, 0, 2))) + .insert(OpcodeInstr::mksimple(0x6fa6, 16, "NULLROTRIF2", std::bind(exec_null_swap_if_many, _1, true, 1, 2))) + .insert(OpcodeInstr::mksimple(0x6fa7, 16, "NULLROTRIFNOT2", std::bind(exec_null_swap_if_many, _1, false, 1, 2))) .insert(OpcodeInstr::mkfixed(0x6fb, 12, 4, dump_tuple_index2, exec_tuple_index2)) .insert(OpcodeInstr::mkfixed(0x6fc >> 2, 10, 6, dump_tuple_index3, exec_tuple_index3)); } diff --git a/submodules/ton/tonlib-src/crypto/vm/utils.cpp b/submodules/ton/tonlib-src/crypto/vm/utils.cpp new file mode 100644 index 0000000000..783bf13276 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/vm/utils.cpp @@ -0,0 +1,152 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ +#include "utils.h" + +namespace vm { + +td::Result convert_stack_entry(td::Slice word); +td::Result> parse_stack_entries_in(td::Slice& str, bool prefix_only = false); +td::Result parse_stack_entry_in(td::Slice& str, bool prefix_only = false); + +namespace { + +td::Slice& skip_spaces(td::Slice& str, const char* delims) { + while (str.size() > 0 && strchr(delims, str[0])) { + str.remove_prefix(1); + } + return str; +} + +td::Slice get_word(td::Slice& str, const char* delims, const char* specials) { + skip_spaces(str, delims); + + size_t p = 0; + while (p < str.size() && !strchr(delims, str[p])) { + if (specials && strchr(specials, str[p])) { + if (!p) { + p++; + } + break; + } + p++; + } + + td::Slice ret = str.copy().truncate(p); + str.remove_prefix(p); + return ret; +} + +} // namespace + +td::Result parse_stack_entry_in(td::Slice& str, bool prefix_only) { + auto word = get_word(str, " \t", "[()]"); + if (word.empty()) { + return td::Status::Error("stack value expected instead of end-of-line"); + } + if (word.size() == 1 && (word[0] == '[' || word[0] == '(')) { + int expected = (word[0] == '(' ? ')' : ']'); + TRY_RESULT(values, parse_stack_entries_in(str, true)); + word = get_word(str, " \t", "[()]"); + if (word.size() != 1 || word[0] != expected) { + return td::Status::Error("closing bracket expected"); + } + vm::StackEntry value; + if (expected == ']') { + value = vm::StackEntry{std::move(values)}; + } else { + value = vm::StackEntry::make_list(std::move(values)); + } + if (prefix_only || (skip_spaces(str, " \t").size() == 0)) { + return value; + } else { + return td::Status::Error("extra data at the end"); + } + } else { + return convert_stack_entry(word); + } +} + +td::Result convert_stack_entry(td::Slice str) { + if (str.empty() || str.size() > 65535) { + return td::Status::Error("too long string"); + } + int l = (int)str.size(); + if (str[0] == '"') { + vm::CellBuilder cb; + if (l == 1 || str.back() != '"' || l >= 127 + 2 || !cb.store_bytes_bool(str.data() + 1, l - 2)) { + return td::Status::Error("incomplete (or too long) string"); + } + return vm::StackEntry{vm::load_cell_slice_ref(cb.finalize())}; + } + if (l >= 3 && (str[0] == 'x' || str[0] == 'b') && str[1] == '{' && str.back() == '}') { + unsigned char buff[128]; + int bits = + (str[0] == 'x') + ? (int)td::bitstring::parse_bitstring_hex_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1) + : (int)td::bitstring::parse_bitstring_binary_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1); + if (bits < 0) { + return td::Status::Error("failed to parse raw b{...}/x{...} number"); + } + return vm::StackEntry{ + Ref{true, vm::CellBuilder().store_bits(td::ConstBitPtr{buff}, bits).finalize()}}; + } + auto num = td::make_refint(); + auto& x = num.unique_write(); + if (l >= 3 && str[0] == '0' && str[1] == 'x') { + if (x.parse_hex(str.data() + 2, l - 2) != l - 2) { + return td::Status::Error("failed to parse 0x... hex number"); + } + } else if (l >= 4 && str[0] == '-' && str[1] == '0' && str[2] == 'x') { + if (x.parse_hex(str.data() + 3, l - 3) != l - 3) { + return td::Status::Error("failed to parse -0x... hex number"); + } + x.negate().normalize(); + } else if (!l || x.parse_dec(str.data(), l) != l) { + return td::Status::Error("failed to parse dec number"); + } + return vm::StackEntry{std::move(num)}; +} + +td::Result> parse_stack_entries_in(td::Slice& str, bool prefix_only) { + std::vector ret; + while (!skip_spaces(str, " \t").empty()) { + auto c = str.copy(); + auto word = get_word(c, " \t", "[()]"); + if (word == "]" || word == ")") { + if (prefix_only) { + return ret; + } else { + return td::Status::Error("not paired closing bracket"); + } + } + TRY_RESULT(value, parse_stack_entry_in(str, true)); + ret.push_back(std::move(value)); + } + return ret; +} + +td::Result> parse_stack_entries(td::Slice str, bool prefix_only) { + return parse_stack_entries_in(str, prefix_only); +} + +td::Result parse_stack_entry(td::Slice str, bool prefix_only) { + return parse_stack_entry_in(str, prefix_only); +} + +} // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/utils.h b/submodules/ton/tonlib-src/crypto/vm/utils.h new file mode 100644 index 0000000000..34d761b1d2 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/vm/utils.h @@ -0,0 +1,29 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ +#pragma once +#include "stack.hpp" + +#include + +namespace vm { + +td::Result> parse_stack_entries(td::Slice str, bool prefix_only = false); +td::Result parse_stack_entry(td::Slice str, bool prefix_only = false); + +} // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/vm.cpp b/submodules/ton/tonlib-src/crypto/vm/vm.cpp new file mode 100644 index 0000000000..395e01d37d --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/vm/vm.cpp @@ -0,0 +1,618 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#include "vm/dispatch.h" +#include "vm/continuation.h" +#include "vm/dict.h" +#include "vm/log.h" +#include "vm/vm.h" + +namespace vm { + +VmState::VmState() : cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) { + ensure_throw(init_cp(0)); + init_cregs(); +} + +VmState::VmState(Ref _code) + : code(std::move(_code)), cp(-1), dispatch(&dummy_dispatch_table), quit0(true, 0), quit1(true, 1) { + ensure_throw(init_cp(0)); + init_cregs(); +} + +VmState::VmState(Ref _code, Ref _stack, int flags, Ref _data, VmLog log, + std::vector> _libraries, Ref init_c7) + : code(std::move(_code)) + , stack(std::move(_stack)) + , cp(-1) + , dispatch(&dummy_dispatch_table) + , quit0(true, 0) + , quit1(true, 1) + , log(log) + , libraries(std::move(_libraries)) { + ensure_throw(init_cp(0)); + set_c4(std::move(_data)); + if (init_c7.not_null()) { + set_c7(std::move(init_c7)); + } + init_cregs(flags & 1, flags & 2); +} + +VmState::VmState(Ref _code, Ref _stack, const GasLimits& gas, int flags, Ref _data, VmLog log, + std::vector> _libraries, Ref init_c7) + : code(std::move(_code)) + , stack(std::move(_stack)) + , cp(-1) + , dispatch(&dummy_dispatch_table) + , quit0(true, 0) + , quit1(true, 1) + , log(log) + , gas(gas) + , libraries(std::move(_libraries)) { + ensure_throw(init_cp(0)); + set_c4(std::move(_data)); + if (init_c7.not_null()) { + set_c7(std::move(init_c7)); + } + init_cregs(flags & 1, flags & 2); +} + +Ref VmState::convert_code_cell(Ref code_cell) { + if (code_cell.is_null()) { + return {}; + } + Ref csr{true, NoVmOrd(), code_cell}; + if (csr->is_valid()) { + return csr; + } + return load_cell_slice_ref(CellBuilder{}.store_ref(std::move(code_cell)).finalize()); +} + +bool VmState::init_cp(int new_cp) { + const DispatchTable* dt = DispatchTable::get_table(new_cp); + if (dt) { + cp = new_cp; + dispatch = dt; + return true; + } else { + return false; + } +} + +bool VmState::set_cp(int new_cp) { + return new_cp == cp || init_cp(new_cp); +} + +void VmState::force_cp(int new_cp) { + if (!set_cp(new_cp)) { + throw VmError{Excno::inv_opcode, "unsupported codepage"}; + } +} + +// simple call to a continuation cont +int VmState::call(Ref cont) { + const ControlData* cont_data = cont->get_cdata(); + if (cont_data) { + if (cont_data->save.c[0].not_null()) { + // call reduces to a jump + return jump(std::move(cont)); + } + if (cont_data->stack.not_null() || cont_data->nargs >= 0) { + // if cont has non-empty stack or expects fixed number of arguments, call is not simple + return call(std::move(cont), -1, -1); + } + // create return continuation, to be stored into new c0 + Ref ret = Ref{true, std::move(code), cp}; + ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0])); + cr.set_c0( + std::move(ret)); // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set + return jump_to(std::move(cont)); + } + // create return continuation, to be stored into new c0 + Ref ret = Ref{true, std::move(code), cp}; + ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0])); + // general implementation of a simple call + cr.set_c0(std::move(ret)); // set c0 to its final value before switching to cont; notice that cont.save.c0 is not set + return jump_to(std::move(cont)); +} + +// call with parameters to continuation cont +int VmState::call(Ref cont, int pass_args, int ret_args) { + const ControlData* cont_data = cont->get_cdata(); + if (cont_data) { + if (cont_data->save.c[0].not_null()) { + // call reduces to a jump + return jump(std::move(cont), pass_args); + } + int depth = stack->depth(); + if (pass_args > depth || cont_data->nargs > depth) { + throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"}; + } + if (cont_data->nargs > pass_args && pass_args >= 0) { + throw VmError{Excno::stk_und, + "stack underflow while calling a closure continuation: not enough arguments passed"}; + } + auto old_c0 = std::move(cr.c[0]); + // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible + preclear_cr(cont_data->save); + // no exceptions should be thrown after this point + int copy = cont_data->nargs, skip = 0; + if (pass_args >= 0) { + if (copy >= 0) { + skip = pass_args - copy; + } else { + copy = pass_args; + } + } + // copy=-1 : pass whole stack, else pass top `copy` elements, drop next `skip` elements. + Ref new_stk; + if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) { + // `cont` already has a stack, create resulting stack from it + if (copy < 0) { + copy = stack->depth(); + } + if (cont->is_unique()) { + // optimization: avoid copying stack if we hold the only copy of `cont` + new_stk = std::move(cont.unique_write().get_cdata()->stack); + } else { + new_stk = cont_data->stack; + } + new_stk.write().move_from_stack(get_stack(), copy); + if (skip > 0) { + get_stack().pop_many(skip); + } + } else if (copy >= 0) { + new_stk = get_stack().split_top(copy, skip); + } else { + new_stk = std::move(stack); + stack.clear(); + } + // create return continuation using the remainder of current stack + Ref ret = Ref{true, std::move(code), cp, std::move(stack), ret_args}; + ret.unique_write().get_cdata()->save.set_c0(std::move(old_c0)); + Ref ord_cont = static_cast>(cont); + set_stack(std::move(new_stk)); + cr.set_c0(std::move(ret)); // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0 + return jump_to(std::move(cont)); + } else { + // have no continuation data, situation is somewhat simpler + int depth = stack->depth(); + if (pass_args > depth) { + throw VmError{Excno::stk_und, "stack underflow while calling a continuation: not enough arguments on stack"}; + } + // create new stack from the top `pass_args` elements of the current stack + Ref new_stk = (pass_args >= 0 ? get_stack().split_top(pass_args) : std::move(stack)); + // create return continuation using the remainder of the current stack + Ref ret = Ref{true, std::move(code), cp, std::move(stack), ret_args}; + ret.unique_write().get_cdata()->save.set_c0(std::move(cr.c[0])); + set_stack(std::move(new_stk)); + cr.set_c0(std::move(ret)); // ??? if codepage of code in ord_cont is unknown, will end up with incorrect c0 + return jump_to(std::move(cont)); + } +} + +// simple jump to continuation cont +int VmState::jump(Ref cont) { + const ControlData* cont_data = cont->get_cdata(); + if (cont_data && (cont_data->stack.not_null() || cont_data->nargs >= 0)) { + // if cont has non-empty stack or expects fixed number of arguments, jump is not simple + return jump(std::move(cont), -1); + } else { + return jump_to(std::move(cont)); + } +} + +// general jump to continuation cont +int VmState::jump(Ref cont, int pass_args) { + const ControlData* cont_data = cont->get_cdata(); + if (cont_data) { + // first do the checks + int depth = stack->depth(); + if (pass_args > depth || cont_data->nargs > depth) { + throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"}; + } + if (cont_data->nargs > pass_args && pass_args >= 0) { + throw VmError{Excno::stk_und, + "stack underflow while jumping to closure continuation: not enough arguments passed"}; + } + // optimization(?): decrease refcnts of unused continuations in c[i] as early as possible + preclear_cr(cont_data->save); + // no exceptions should be thrown after this point + int copy = cont_data->nargs; + if (pass_args >= 0 && copy < 0) { + copy = pass_args; + } + // copy=-1 : pass whole stack, else pass top `copy` elements, drop the remainder. + if (cont_data->stack.not_null() && !cont_data->stack->is_empty()) { + // `cont` already has a stack, create resulting stack from it + if (copy < 0) { + copy = get_stack().depth(); + } + Ref new_stk; + if (cont->is_unique()) { + // optimization: avoid copying the stack if we hold the only copy of `cont` + new_stk = std::move(cont.unique_write().get_cdata()->stack); + } else { + new_stk = cont_data->stack; + } + new_stk.write().move_from_stack(get_stack(), copy); + set_stack(std::move(new_stk)); + } else { + if (copy >= 0) { + get_stack().drop_bottom(stack->depth() - copy); + } + } + return jump_to(std::move(cont)); + } else { + // have no continuation data, situation is somewhat simpler + if (pass_args >= 0) { + int depth = get_stack().depth(); + if (pass_args > depth) { + throw VmError{Excno::stk_und, "stack underflow while jumping to a continuation: not enough arguments on stack"}; + } + get_stack().drop_bottom(depth - pass_args); + } + return jump_to(std::move(cont)); + } +} + +int VmState::ret() { + Ref cont = quit0; + cont.swap(cr.c[0]); + return jump(std::move(cont)); +} + +int VmState::ret(int ret_args) { + Ref cont = quit0; + cont.swap(cr.c[0]); + return jump(std::move(cont), ret_args); +} + +int VmState::ret_alt() { + Ref cont = quit1; + cont.swap(cr.c[1]); + return jump(std::move(cont)); +} + +int VmState::ret_alt(int ret_args) { + Ref cont = quit1; + cont.swap(cr.c[1]); + return jump(std::move(cont), ret_args); +} + +Ref VmState::extract_cc(int save_cr, int stack_copy, int cc_args) { + Ref new_stk; + if (stack_copy < 0 || stack_copy == stack->depth()) { + new_stk = std::move(stack); + stack.clear(); + } else if (stack_copy > 0) { + stack->check_underflow(stack_copy); + new_stk = get_stack().split_top(stack_copy); + } else { + new_stk = Ref{true}; + } + Ref cc = Ref{true, std::move(code), cp, std::move(stack), cc_args}; + stack = std::move(new_stk); + if (save_cr & 7) { + ControlData* cdata = cc.unique_write().get_cdata(); + if (save_cr & 1) { + cdata->save.set_c0(std::move(cr.c[0])); + cr.set_c0(quit0); + } + if (save_cr & 2) { + cdata->save.set_c1(std::move(cr.c[1])); + cr.set_c1(quit1); + } + if (save_cr & 4) { + cdata->save.set_c2(std::move(cr.c[2])); + // cr.set_c2(Ref{true}); + } + } + return cc; +} + +int VmState::throw_exception(int excno) { + Stack& stack_ref = get_stack(); + stack_ref.clear(); + stack_ref.push_smallint(0); + stack_ref.push_smallint(excno); + code.clear(); + consume_gas(exception_gas_price); + return jump(get_c2()); +} + +int VmState::throw_exception(int excno, StackEntry&& arg) { + Stack& stack_ref = get_stack(); + stack_ref.clear(); + stack_ref.push(std::move(arg)); + stack_ref.push_smallint(excno); + code.clear(); + consume_gas(exception_gas_price); + return jump(get_c2()); +} + +void GasLimits::gas_exception() const { + throw VmNoGas{}; +} + +void GasLimits::set_limits(long long _max, long long _limit, long long _credit) { + gas_max = _max; + gas_limit = _limit; + gas_credit = _credit; + change_base(_limit + _credit); +} + +void GasLimits::change_limit(long long _limit) { + _limit = std::min(std::max(_limit, 0LL), gas_max); + gas_credit = 0; + gas_limit = _limit; + change_base(_limit); +} + +bool VmState::set_gas_limits(long long _max, long long _limit, long long _credit) { + gas.set_limits(_max, _limit, _credit); + return true; +} + +void VmState::change_gas_limit(long long new_limit) { + VM_LOG(this) << "changing gas limit to " << std::min(new_limit, gas.gas_max); + gas.change_limit(new_limit); +} + +int VmState::step() { + assert(!code.is_null()); + //VM_LOG(st) << "stack:"; stack->dump(VM_LOG(st)); + //VM_LOG(st) << "; cr0.refcnt = " << get_c0()->get_refcnt() - 1 << std::endl; + if (stack_trace) { + stack->dump(std::cerr, 3); + } + ++steps; + if (code->size()) { + return dispatch->dispatch(this, code.write()); + } else if (code->size_refs()) { + VM_LOG(this) << "execute implicit JMPREF"; + gas.consume_chk(implicit_jmpref_gas_price); + Ref cont = Ref{true, load_cell_slice_ref(code->prefetch_ref()), get_cp()}; + return jump(std::move(cont)); + } else { + VM_LOG(this) << "execute implicit RET"; + gas.consume_chk(implicit_ret_gas_price); + return ret(); + } +} + +int VmState::run() { + if (code.is_null()) { + throw VmError{Excno::fatal, "cannot run an uninitialized VM"}; + } + int res; + Guard guard(this); + do { + // LOG(INFO) << "[BS] data cells: " << DataCell::get_total_data_cells(); + try { + try { + try { + res = step(); + gas.check(); + } catch (vm::CellBuilder::CellWriteError) { + throw VmError{Excno::cell_ov}; + } catch (vm::CellBuilder::CellCreateError) { + throw VmError{Excno::cell_ov}; + } catch (vm::CellSlice::CellReadError) { + throw VmError{Excno::cell_und}; + } + } catch (const VmError& vme) { + VM_LOG(this) << "handling exception code " << vme.get_errno() << ": " << vme.get_msg(); + try { + // LOG(INFO) << "[EX] data cells: " << DataCell::get_total_data_cells(); + ++steps; + res = throw_exception(vme.get_errno()); + } catch (const VmError& vme2) { + VM_LOG(this) << "exception " << vme2.get_errno() << " while handling exception: " << vme.get_msg(); + // LOG(INFO) << "[EXX] data cells: " << DataCell::get_total_data_cells(); + return ~vme2.get_errno(); + } + } + } catch (VmNoGas vmoog) { + ++steps; + VM_LOG(this) << "unhandled out-of-gas exception: gas consumed=" << gas.gas_consumed() + << ", limit=" << gas.gas_limit; + get_stack().clear(); + get_stack().push_smallint(gas.gas_consumed()); + return vmoog.get_errno(); // no ~ for unhandled exceptions (to make their faking impossible) + } + } while (!res); + // LOG(INFO) << "[EN] data cells: " << DataCell::get_total_data_cells(); + if ((res | 1) == -1 && !try_commit()) { + VM_LOG(this) << "automatic commit failed (new data or action cells too deep)"; + get_stack().clear(); + get_stack().push_smallint(0); + return ~(int)Excno::cell_ov; + } + return res; +} + +bool VmState::try_commit() { + if (cr.d[0].not_null() && cr.d[1].not_null() && cr.d[0]->get_depth() <= max_data_depth && + cr.d[1]->get_depth() <= max_data_depth) { + cstate.c4 = cr.d[0]; + cstate.c5 = cr.d[1]; + cstate.committed = true; + return true; + } else { + return false; + } +} + +void VmState::force_commit() { + if (!try_commit()) { + throw VmError{Excno::cell_ov, "cannot commit too deep cells as new data/actions"}; + } +} + +ControlData* force_cdata(Ref& cont) { + if (!cont->get_cdata()) { + cont = Ref{true, cont}; + return cont.unique_write().get_cdata(); + } else { + return cont.write().get_cdata(); + } +} + +ControlRegs* force_cregs(Ref& cont) { + return &force_cdata(cont)->save; +} + +int run_vm_code(Ref code, Ref& stack, int flags, Ref* data_ptr, VmLog log, long long* steps, + GasLimits* gas_limits, std::vector> libraries, Ref init_c7, Ref* actions_ptr) { + VmState vm{code, + std::move(stack), + gas_limits ? *gas_limits : GasLimits{}, + flags, + data_ptr ? *data_ptr : Ref{}, + log, + std::move(libraries), + std::move(init_c7)}; + int res = vm.run(); + stack = vm.get_stack_ref(); + if (vm.committed() && data_ptr) { + *data_ptr = vm.get_committed_state().c4; + } + if (vm.committed() && actions_ptr) { + *actions_ptr = vm.get_committed_state().c5; + } + if (steps) { + *steps = vm.get_steps_count(); + } + if (gas_limits) { + *gas_limits = vm.get_gas_limits(); + LOG(INFO) << "steps: " << vm.get_steps_count() << " gas: used=" << gas_limits->gas_consumed() + << ", max=" << gas_limits->gas_max << ", limit=" << gas_limits->gas_limit + << ", credit=" << gas_limits->gas_credit; + } + if ((vm.get_log().log_mask & vm::VmLog::DumpStack) != 0) { + VM_LOG(&vm) << "BEGIN_STACK_DUMP"; + for (int i = stack->depth(); i > 0; i--) { + VM_LOG(&vm) << (*stack)[i - 1].to_string(); + } + VM_LOG(&vm) << "END_STACK_DUMP"; + } + + return ~res; +} + +int run_vm_code(Ref code, Stack& stack, int flags, Ref* data_ptr, VmLog log, long long* steps, + GasLimits* gas_limits, std::vector> libraries, Ref init_c7, Ref* actions_ptr) { + Ref stk{true}; + stk.unique_write().set_contents(std::move(stack)); + stack.clear(); + int res = run_vm_code(code, stk, flags, data_ptr, log, steps, gas_limits, std::move(libraries), std::move(init_c7), + actions_ptr); + CHECK(stack.is_unique()); + if (stk.is_null()) { + stack.clear(); + } else if (&(*stk) != &stack) { + VmState* st = nullptr; + if (stk->is_unique()) { + VM_LOG(st) << "move resulting stack (" << stk->depth() << " entries)"; + stack.set_contents(std::move(stk.unique_write())); + } else { + VM_LOG(st) << "copying resulting stack (" << stk->depth() << " entries)"; + stack.set_contents(*stk); + } + } + return res; +} + +// may throw a dictionary exception; returns nullptr if library is not found in context +Ref VmState::load_library(td::ConstBitPtr hash) { + std::unique_ptr tmp_ctx; + // install temporary dummy vm state interface to prevent charging for cell load operations during library lookup + VmStateInterface::Guard(tmp_ctx.get()); + for (const auto& lib_collection : libraries) { + auto lib = lookup_library_in(hash, lib_collection); + if (lib.not_null()) { + return lib; + } + } + return {}; +} + +bool VmState::register_library_collection(Ref lib) { + if (lib.is_null()) { + return true; + } + libraries.push_back(std::move(lib)); + return true; +} + +void VmState::register_cell_load(const CellHash& cell_hash) { + if (cell_load_gas_price == cell_reload_gas_price) { + consume_gas(cell_load_gas_price); + } else { + auto ok = loaded_cells.insert(cell_hash); // check whether this is the first time this cell is loaded + if (ok.second) { + loaded_cells_count++; + } + consume_gas(ok.second ? cell_load_gas_price : cell_reload_gas_price); + } +} + +void VmState::register_cell_create() { + consume_gas(cell_create_gas_price); +} + +td::BitArray<256> VmState::get_state_hash() const { + // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash + td::BitArray<256> res; + res.clear(); + return res; +} + +td::BitArray<256> VmState::get_final_state_hash(int exit_code) const { + // TODO: implement properly, by serializing the stack etc, and computing the Merkle hash + td::BitArray<256> res; + res.clear(); + return res; +} + +Ref lookup_library_in(td::ConstBitPtr key, vm::Dictionary& dict) { + try { + auto val = dict.lookup(key, 256); + if (val.is_null() || !val->have_refs()) { + return {}; + } + auto root = val->prefetch_ref(); + if (root.not_null() && !root->get_hash().bits().compare(key, 256)) { + return root; + } + return {}; + } catch (vm::VmError) { + return {}; + } +} + +Ref lookup_library_in(td::ConstBitPtr key, Ref lib_root) { + if (lib_root.is_null()) { + return lib_root; + } + vm::Dictionary dict{std::move(lib_root), 256}; + return lookup_library_in(key, dict); +} + +} // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/vm.h b/submodules/ton/tonlib-src/crypto/vm/vm.h new file mode 100644 index 0000000000..19c3829f11 --- /dev/null +++ b/submodules/ton/tonlib-src/crypto/vm/vm.h @@ -0,0 +1,320 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#pragma once + +#include "common/refcnt.hpp" +#include "vm/cellslice.h" +#include "vm/stack.hpp" +#include "vm/vmstate.h" +#include "vm/log.h" +#include "vm/continuation.h" +#include "td/utils/HashSet.h" + +namespace vm { + +using td::Ref; +struct GasLimits { + static constexpr long long infty = (1ULL << 63) - 1; + long long gas_max, gas_limit, gas_credit, gas_remaining, gas_base; + GasLimits() : gas_max(infty), gas_limit(infty), gas_credit(0), gas_remaining(infty), gas_base(infty) { + } + GasLimits(long long _limit, long long _max = infty, long long _credit = 0) + : gas_max(_max) + , gas_limit(_limit) + , gas_credit(_credit) + , gas_remaining(_limit + _credit) + , gas_base(gas_remaining) { + } + long long gas_consumed() const { + return gas_base - gas_remaining; + } + void set_limits(long long _max, long long _limit, long long _credit = 0); + void change_base(long long _base) { + gas_remaining += _base - gas_base; + gas_base = _base; + } + void change_limit(long long _limit); + void consume(long long amount) { + // LOG(DEBUG) << "consume " << amount << " gas (" << gas_remaining << " remaining)"; + gas_remaining -= amount; + } + bool try_consume(long long amount) { + // LOG(DEBUG) << "try consume " << amount << " gas (" << gas_remaining << " remaining)"; + return (gas_remaining -= amount) >= 0; + } + void gas_exception() const; + void gas_exception(bool cond) const { + if (!cond) { + gas_exception(); + } + } + void consume_chk(long long amount) { + gas_exception(try_consume(amount)); + } + void check() const { + gas_exception(gas_remaining >= 0); + } + bool final_ok() const { + return gas_remaining >= gas_credit; + } +}; + +struct CommittedState { + Ref c4, c5; + bool committed{false}; +}; + +class VmState final : public VmStateInterface { + Ref code; + Ref stack; + ControlRegs cr; + CommittedState cstate; + int cp; + long long steps{0}; + const DispatchTable* dispatch; + Ref quit0, quit1; + VmLog log; + GasLimits gas; + std::vector> libraries; + td::HashSet loaded_cells; + td::int64 loaded_cells_count{0}; + int stack_trace{0}, debug_off{0}; + bool chksig_always_succeed{false}; + + public: + enum { + cell_load_gas_price = 100, + cell_reload_gas_price = 25, + cell_create_gas_price = 500, + exception_gas_price = 50, + tuple_entry_gas_price = 1, + implicit_jmpref_gas_price = 10, + implicit_ret_gas_price = 5, + max_data_depth = 512 + }; + VmState(); + VmState(Ref _code); + VmState(Ref _code, Ref _stack, int flags = 0, Ref _data = {}, VmLog log = {}, + std::vector> _libraries = {}, Ref init_c7 = {}); + VmState(Ref _code, Ref _stack, const GasLimits& _gas, int flags = 0, Ref _data = {}, + VmLog log = {}, std::vector> _libraries = {}, Ref init_c7 = {}); + template + VmState(Ref code_cell, Args&&... args) + : VmState(convert_code_cell(std::move(code_cell)), std::forward(args)...) { + } + VmState(const VmState&) = delete; + VmState(VmState&&) = delete; + VmState& operator=(const VmState&) = delete; + VmState& operator=(VmState&&) = delete; + bool set_gas_limits(long long _max, long long _limit, long long _credit = 0); + bool final_gas_ok() const { + return gas.final_ok(); + } + long long gas_consumed() const { + return gas.gas_consumed(); + } + bool committed() const { + return cstate.committed; + } + const CommittedState& get_committed_state() const { + return cstate; + } + void consume_gas(long long amount) { + gas.consume(amount); + } + void consume_tuple_gas(unsigned tuple_len) { + consume_gas(tuple_len * tuple_entry_gas_price); + } + void consume_tuple_gas(const Ref& tup) { + if (tup.not_null()) { + consume_tuple_gas((unsigned)tup->size()); + } + } + GasLimits get_gas_limits() const { + return gas; + } + void change_gas_limit(long long new_limit); + template + void check_underflow(Args... args) { + stack->check_underflow(args...); + } + bool register_library_collection(Ref lib); + Ref load_library( + td::ConstBitPtr hash) override; // may throw a dictionary exception; returns nullptr if library is not found + void register_cell_load(const CellHash& cell_hash) override; + void register_cell_create() override; + bool init_cp(int new_cp); + bool set_cp(int new_cp); + void force_cp(int new_cp); + int get_cp() const { + return cp; + } + int incr_stack_trace(int v) { + return stack_trace += v; + } + long long get_steps_count() const { + return steps; + } + td::BitArray<256> get_state_hash() const; + td::BitArray<256> get_final_state_hash(int exit_code) const; + int step(); + int run(); + Stack& get_stack() { + return stack.write(); + } + const Stack& get_stack_const() const { + return *stack; + } + Ref get_stack_ref() const { + return stack; + } + Ref get_c0() const { + return cr.c[0]; + } + Ref get_c1() const { + return cr.c[1]; + } + Ref get_c2() const { + return cr.c[2]; + } + Ref get_c3() const { + return cr.c[3]; + } + Ref get_c4() const { + return cr.d[0]; + } + Ref get_c7() const { + return cr.c7; + } + Ref get_c(unsigned idx) const { + return cr.get_c(idx); + } + Ref get_d(unsigned idx) const { + return cr.get_d(idx); + } + StackEntry get(unsigned idx) const { + return cr.get(idx); + } + const VmLog& get_log() const { + return log; + } + void define_c0(Ref cont) { + cr.define_c0(std::move(cont)); + } + void set_c0(Ref cont) { + cr.set_c0(std::move(cont)); + } + void set_c1(Ref cont) { + cr.set_c1(std::move(cont)); + } + void set_c2(Ref cont) { + cr.set_c2(std::move(cont)); + } + bool set_c(unsigned idx, Ref val) { + return cr.set_c(idx, std::move(val)); + } + bool set_d(unsigned idx, Ref val) { + return cr.set_d(idx, std::move(val)); + } + void set_c4(Ref val) { + cr.set_c4(std::move(val)); + } + bool set_c7(Ref val) { + return cr.set_c7(std::move(val)); + } + bool set(unsigned idx, StackEntry val) { + return cr.set(idx, std::move(val)); + } + void set_stack(Ref new_stk) { + stack = std::move(new_stk); + } + Ref swap_stack(Ref new_stk) { + stack.swap(new_stk); + return new_stk; + } + void ensure_throw(bool cond) const { + if (!cond) { + fatal(); + } + } + void set_code(Ref _code, int _cp) { + code = std::move(_code); + force_cp(_cp); + } + Ref get_code() const { + return code; + } + void push_code() { + get_stack().push_cellslice(get_code()); + } + void adjust_cr(const ControlRegs& save) { + cr ^= save; + } + void adjust_cr(ControlRegs&& save) { + cr ^= save; + } + void preclear_cr(const ControlRegs& save) { + cr &= save; + } + int call(Ref cont); + int call(Ref cont, int pass_args, int ret_args = -1); + int jump(Ref cont); + int jump(Ref cont, int pass_args); + int ret(); + int ret(int ret_args); + int ret_alt(); + int ret_alt(int ret_args); + int repeat(Ref body, Ref after, long long count); + int again(Ref body); + int until(Ref body, Ref after); + int loop_while(Ref cond, Ref body, Ref after); + int throw_exception(int excno, StackEntry&& arg); + int throw_exception(int excno); + Ref extract_cc(int save_cr = 1, int stack_copy = -1, int cc_args = -1); + void fatal(void) const { + throw VmFatal{}; + } + int jump_to(Ref cont) { + return cont->is_unique() ? cont.unique_write().jump_w(this) : cont->jump(this); + } + static Ref convert_code_cell(Ref code_cell); + bool try_commit(); + void force_commit(); + + void set_chksig_always_succeed(bool flag) { + chksig_always_succeed = flag; + } + bool get_chksig_always_succeed() const { + return chksig_always_succeed; + } + + private: + void init_cregs(bool same_c3 = false, bool push_0 = true); +}; + +int run_vm_code(Ref _code, Ref& _stack, int flags = 0, Ref* data_ptr = nullptr, VmLog log = {}, + long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector> libraries = {}, + Ref init_c7 = {}, Ref* actions_ptr = nullptr); +int run_vm_code(Ref _code, Stack& _stack, int flags = 0, Ref* data_ptr = nullptr, VmLog log = {}, + long long* steps = nullptr, GasLimits* gas_limits = nullptr, std::vector> libraries = {}, + Ref init_c7 = {}, Ref* actions_ptr = nullptr); + +Ref lookup_library_in(td::ConstBitPtr key, Ref lib_root); + +} // namespace vm diff --git a/submodules/ton/tonlib-src/crypto/vm/vmstate.h b/submodules/ton/tonlib-src/crypto/vm/vmstate.h index 312b662688..a81a4e78d6 100644 --- a/submodules/ton/tonlib-src/crypto/vm/vmstate.h +++ b/submodules/ton/tonlib-src/crypto/vm/vmstate.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "common/refcnt.hpp" @@ -28,12 +28,16 @@ using td::Ref; class VmStateInterface : public td::Context { public: virtual ~VmStateInterface() = default; - virtual Ref load_library( + virtual Ref load_library( td::ConstBitPtr hash) { // may throw a dictionary exception; returns nullptr if library is not found return {}; } - virtual void register_cell_load(){}; + virtual void register_cell_load(const CellHash& cell_hash){}; virtual void register_cell_create(){}; + virtual void register_new_cell(Ref& cell){}; + virtual bool register_op(int op_units = 1) { + return true; + }; }; } // namespace vm diff --git a/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp b/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp index 82503faf35..5bc8ca7380 100644 --- a/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp +++ b/submodules/ton/tonlib-src/lite-client/lite-client-common.cpp @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #include "lite-client-common.h" #include "auto/tl/lite_api.hpp" @@ -9,6 +27,7 @@ using namespace std::literals::string_literals; namespace liteclient { + td::Result> deserialize_proof_chain( ton::lite_api::object_ptr f) { // deserialize proof chain @@ -75,6 +94,7 @@ td::Result> deserialize_proof_chain( LOG(DEBUG) << "deserialized a BlkProofChain of " << chain->link_count() << " links"; return std::move(chain); } + td::Ref prepare_vm_c7(ton::UnixTime now, ton::LogicalTime lt, td::Ref my_addr, const block::CurrencyCollection& balance) { td::BitArray<256> rand_seed; @@ -96,4 +116,5 @@ td::Ref prepare_vm_c7(ton::UnixTime now, ton::LogicalTime lt, td::Ref LOG(DEBUG) << "SmartContractInfo initialized with " << vm::StackEntry(tuple).to_string(); return vm::make_tuple_ref(std::move(tuple)); } + } // namespace liteclient diff --git a/submodules/ton/tonlib-src/lite-client/lite-client-common.h b/submodules/ton/tonlib-src/lite-client/lite-client-common.h index bca2c3079d..a73dab91d0 100644 --- a/submodules/ton/tonlib-src/lite-client/lite-client-common.h +++ b/submodules/ton/tonlib-src/lite-client/lite-client-common.h @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #pragma once #include "crypto/block/block.h" @@ -5,6 +23,7 @@ #include "auto/tl/lite_api.hpp" namespace liteclient { + td::Result> deserialize_proof_chain( ton::lite_api::object_ptr f); diff --git a/submodules/ton/tonlib-src/lite-client/lite-client.cpp b/submodules/ton/tonlib-src/lite-client/lite-client.cpp index 54eb61b6ac..3dedabe2e5 100644 --- a/submodules/ton/tonlib-src/lite-client/lite-client.cpp +++ b/submodules/ton/tonlib-src/lite-client/lite-client.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "lite-client.h" @@ -55,10 +55,13 @@ #include "vm/boc.h" #include "vm/cellops.h" #include "vm/cells/MerkleProof.h" -#include "vm/continuation.h" +#include "vm/vm.h" #include "vm/cp0.h" +#include "vm/memo.h" #include "ton/ton-shard.h" #include "openssl/rand.hpp" +#include "crypto/vm/utils.h" +#include "crypto/common/util.h" #if TD_DARWIN || TD_LINUX #include @@ -140,6 +143,8 @@ void TestNode::got_result() { parse_line(std::move(data)); } if (ex_mode_ && !running_queries_ && ex_queries_.size() == 0) { + std::cout.flush(); + std::cerr.flush(); std::_Exit(0); } } @@ -177,6 +182,14 @@ bool TestNode::envelope_send_query(td::BufferSlice query, td::Promise TestNode::trivial_promise() { + return td::PromiseCreator::lambda([Self = actor_id(this)](td::Result res) { + if (res.is_error()) { + LOG(ERROR) << "error: " << res.move_as_error(); + } + }); +} + bool TestNode::register_blkid(const ton::BlockIdExt& blkid) { for (const auto& id : known_blk_ids_) { if (id == blkid) { @@ -497,7 +510,7 @@ void TestNode::run_init_queries() { get_server_version(0x100); } -std::string TestNode::get_word(char delim) { +td::Slice TestNode::get_word(char delim) { if (delim == ' ' || !delim) { skipspc(); } @@ -506,10 +519,33 @@ std::string TestNode::get_word(char delim) { ptr++; } std::swap(ptr, parse_ptr_); - return std::string{ptr, parse_ptr_}; + return td::Slice{ptr, parse_ptr_}; +} + +td::Slice TestNode::get_word_ext(const char* delims, const char* specials) { + if (delims[0] == ' ') { + skipspc(); + } + const char* ptr = parse_ptr_; + while (ptr < parse_end_ && !strchr(delims, *ptr)) { + if (specials && strchr(specials, *ptr)) { + if (ptr == parse_ptr_) { + ptr++; + } + break; + } + ptr++; + } + std::swap(ptr, parse_ptr_); + return td::Slice{ptr, parse_ptr_}; } bool TestNode::get_word_to(std::string& str, char delim) { + str = get_word(delim).str(); + return !str.empty(); +} + +bool TestNode::get_word_to(td::Slice& str, char delim) { str = get_word(delim); return !str.empty(); } @@ -545,16 +581,21 @@ bool TestNode::seekeoln() { return eoln(); } -bool TestNode::parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr) { - return block::parse_std_account_addr(get_word(), wc, addr) || set_error("cannot parse account address"); +bool TestNode::parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr, bool allow_none) { + auto word = get_word(); + if (allow_none && (word == "none" || word == "root")) { + wc = ton::workchainInvalid; + return true; + } + return block::parse_std_account_addr(word, wc, addr) || set_error("cannot parse account address"); } -bool TestNode::convert_uint64(std::string word, td::uint64& val) { +bool TestNode::convert_uint64(td::Slice word, td::uint64& val) { val = ~0ULL; if (word.empty()) { return false; } - const char* ptr = word.c_str(); + const char* ptr = word.data(); char* end = nullptr; val = std::strtoull(ptr, &end, 10); if (end == ptr + word.size()) { @@ -565,12 +606,12 @@ bool TestNode::convert_uint64(std::string word, td::uint64& val) { } } -bool TestNode::convert_int64(std::string word, td::int64& val) { +bool TestNode::convert_int64(td::Slice word, td::int64& val) { val = (~0ULL << 63); if (word.empty()) { return false; } - const char* ptr = word.c_str(); + const char* ptr = word.data(); char* end = nullptr; val = std::strtoll(ptr, &end, 10); if (end == ptr + word.size()) { @@ -581,7 +622,7 @@ bool TestNode::convert_int64(std::string word, td::int64& val) { } } -bool TestNode::convert_uint32(std::string word, td::uint32& val) { +bool TestNode::convert_uint32(td::Slice word, td::uint32& val) { td::uint64 tmp; if (convert_uint64(word, tmp) && (td::uint32)tmp == tmp) { val = (td::uint32)tmp; @@ -591,7 +632,7 @@ bool TestNode::convert_uint32(std::string word, td::uint32& val) { } } -bool TestNode::convert_int32(std::string word, td::int32& val) { +bool TestNode::convert_int32(td::Slice word, td::int32& val) { td::int64 tmp; if (convert_int64(word, tmp) && (td::int32)tmp == tmp) { val = (td::int32)tmp; @@ -609,6 +650,14 @@ bool TestNode::parse_uint32(td::uint32& val) { return convert_uint32(get_word(), val) || set_error("cannot parse 32-bit unsigned integer"); } +bool TestNode::parse_int32(td::int32& val) { + return convert_int32(get_word(), val) || set_error("cannot parse 32-bit integer"); +} + +bool TestNode::parse_int16(int& val) { + return (convert_int32(get_word(), val) && val == (td::int16)val) || set_error("cannot parse 16-bit integer"); +} + bool TestNode::set_error(td::Status error) { if (error.is_ok()) { return true; @@ -631,6 +680,10 @@ int TestNode::parse_hex_digit(int c) { return -1; } +bool TestNode::parse_hash(td::Slice str, ton::Bits256& hash) { + return str.size() == 64 && parse_hash(str.data(), hash); +} + bool TestNode::parse_hash(const char* str, ton::Bits256& hash) { unsigned char* data = hash.data(); for (int i = 0; i < 32; i++) { @@ -690,15 +743,15 @@ bool TestNode::parse_block_id_ext(std::string blkid_str, ton::BlockIdExt& blkid, } bool TestNode::parse_block_id_ext(ton::BlockIdExt& blk, bool allow_incomplete) { - return parse_block_id_ext(get_word(), blk, allow_incomplete) || set_error("cannot parse BlockIdExt"); + return parse_block_id_ext(get_word().str(), blk, allow_incomplete) || set_error("cannot parse BlockIdExt"); } bool TestNode::parse_hash(ton::Bits256& hash) { auto word = get_word(); - return (!word.empty() && parse_hash(word.c_str(), hash)) || set_error("cannot parse hash"); + return parse_hash(word, hash) || set_error("cannot parse hash"); } -bool TestNode::convert_shard_id(std::string str, ton::ShardIdFull& shard) { +bool TestNode::convert_shard_id(td::Slice str, ton::ShardIdFull& shard) { shard.workchain = ton::workchainInvalid; shard.shard = 0; auto pos = str.find(':'); @@ -729,54 +782,6 @@ bool TestNode::parse_shard_id(ton::ShardIdFull& shard) { return convert_shard_id(get_word(), shard) || set_error("cannot parse full shard identifier or prefix"); } -bool TestNode::parse_stack_value(td::Slice str, vm::StackEntry& value) { - if (str.empty() || str.size() > 65535) { - return false; - } - int l = (int)str.size(); - if (str[0] == '"') { - vm::CellBuilder cb; - if (l == 1 || str.back() != '"' || l >= 127 + 2 || !cb.store_bytes_bool(str.data() + 1, l - 2)) { - return false; - } - value = vm::StackEntry{vm::load_cell_slice_ref(cb.finalize())}; - return true; - } - if (l >= 3 && (str[0] == 'x' || str[0] == 'b') && str[1] == '{' && str.back() == '}') { - unsigned char buff[128]; - int bits = - (str[0] == 'x') - ? (int)td::bitstring::parse_bitstring_hex_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1) - : (int)td::bitstring::parse_bitstring_binary_literal(buff, sizeof(buff), str.begin() + 2, str.end() - 1); - if (bits < 0) { - return false; - } - value = - vm::StackEntry{Ref{true, vm::CellBuilder().store_bits(td::ConstBitPtr{buff}, bits).finalize()}}; - return true; - } - auto num = td::RefInt256{true}; - auto& x = num.unique_write(); - if (l >= 3 && str[0] == '0' && str[1] == 'x') { - if (x.parse_hex(str.data() + 2, l - 2) != l - 2) { - return false; - } - } else if (l >= 4 && str[0] == '-' && str[1] == '0' && str[2] == 'x') { - if (x.parse_hex(str.data() + 3, l - 3) != l - 3) { - return false; - } - x.negate().normalize(); - } else if (!l || x.parse_dec(str.data(), l) != l) { - return false; - } - value = vm::StackEntry{std::move(num)}; - return true; -} - -bool TestNode::parse_stack_value(vm::StackEntry& value) { - return parse_stack_value(td::Slice{get_word()}, value) || set_error("invalid vm stack value"); -} - bool TestNode::set_error(std::string err_msg) { return set_error(td::Status::Error(-1, err_msg)); } @@ -820,8 +825,12 @@ bool TestNode::show_help(std::string command) { "saveaccount[code|data] []\tSaves into specified file the most recent state " "(StateInit) or just the code or data of specified account; is in " "[:] format\n" - "runmethod [] ...\tRuns GET method of account " + "runmethod[full] [] ...\tRuns GET method of account " + " " "with specified parameters\n" + "dnsresolve [] []\tResolves a domain starting from root dns smart contract\n" + "dnsresolvestep [] []\tResolves a subdomain using dns smart contract " + "\n" "allshards []\tShows shard configuration from the most recent masterchain " "state or from masterchain state corresponding to \n" "getconfig [...]\tShows specified or all configuration parameters from the latest masterchain state\n" @@ -848,6 +857,11 @@ bool TestNode::show_help(std::string command) { "header\n" "byutime \tLooks up a block by workchain, shard and creation time, and " "shows its header\n" + "creatorstats [ []]\tLists block creator statistics by validator public " + "key\n" + "recentcreatorstats [ []]\tLists block creator statistics " + "updated after by validator public " + "key\n" "known\tShows the list of all known block ids\n" "privkey \tLoads a private key from file\n" "help []\tThis help\n" @@ -865,7 +879,7 @@ bool TestNode::do_parse_line() { ton::BlockSeqno seqno{}; ton::UnixTime utime{}; unsigned count{}; - std::string word = get_word(); + std::string word = get_word().str(); skipspc(); if (word == "time") { return eoln() && get_server_time(); @@ -886,21 +900,30 @@ bool TestNode::do_parse_line() { (seekeoln() ? get_account_state(workchain, addr, mc_last_id_, filename, mode) : parse_block_id_ext(blkid) && seekeoln() && get_account_state(workchain, addr, blkid, filename, mode)); - } else if (word == "runmethod") { + } else if (word == "runmethod" || word == "runmethodx" || word == "runmethodfull") { std::string method; return parse_account_addr(workchain, addr) && get_word_to(method) && (parse_block_id_ext(method, blkid) ? get_word_to(method) : (blkid = mc_last_id_).is_valid()) && - parse_run_method(workchain, addr, blkid, method); + parse_run_method(workchain, addr, blkid, method, word.size() <= 10); + } else if (word == "dnsresolve" || word == "dnsresolvestep") { + workchain = ton::workchainInvalid; + bool step = (word.size() > 10); + std::string domain; + int cat = 0; + return (!step || parse_account_addr(workchain, addr)) && get_word_to(domain) && + (parse_block_id_ext(domain, blkid) ? get_word_to(domain) : (blkid = mc_last_id_).is_valid()) && + (seekeoln() || parse_int16(cat)) && seekeoln() && + dns_resolve_start(workchain, addr, blkid, domain, cat, step); } else if (word == "allshards") { return eoln() ? get_all_shards() : (parse_block_id_ext(blkid) && seekeoln() && get_all_shards(false, blkid)); } else if (word == "saveconfig") { blkid = mc_last_id_; std::string filename; return get_word_to(filename) && (seekeoln() || parse_block_id_ext(blkid)) && seekeoln() && - get_config_params(blkid, -1, filename); + get_config_params(blkid, trivial_promise(), -1, filename); } else if (word == "getconfig" || word == "getconfigfrom") { blkid = mc_last_id_; - return (word == "getconfig" || parse_block_id_ext(blkid)) && get_config_params(blkid, 0); + return (word == "getconfig" || parse_block_id_ext(blkid)) && get_config_params(blkid, trivial_promise(), 0); } else if (word == "getblock") { return parse_block_id_ext(blkid) && seekeoln() && get_block(blkid, false); } else if (word == "dumpblock") { @@ -935,6 +958,12 @@ bool TestNode::do_parse_line() { return parse_shard_id(shard) && parse_uint32(utime) && seekeoln() && lookup_block(shard, 4, utime); } else if (word == "bylt") { return parse_shard_id(shard) && parse_lt(lt) && seekeoln() && lookup_block(shard, 2, lt); + } else if (word == "creatorstats" || word == "recentcreatorstats") { + count = 1000; + int mode = (word == "recentcreatorstats" ? 4 : 0); + return parse_block_id_ext(blkid) && (!mode || parse_uint32(utime)) && (seekeoln() || parse_uint32(count)) && + (seekeoln() || (parse_hash(hash) && (mode |= 1))) && seekeoln() && + get_creator_stats(blkid, mode, count, hash, utime); } else if (word == "known") { return eoln() && show_new_blkids(true); } else if (word == "quit" && eoln()) { @@ -1024,16 +1053,32 @@ bool TestNode::get_account_state(ton::WorkchainId workchain, ton::StdSmcAddress }); } -bool TestNode::parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid, - std::string method_name) { - std::vector params; - while (!seekeoln()) { - vm::StackEntry param; - if (!parse_stack_value(param)) { - return false; - } - params.push_back(std::move(param)); +td::int64 TestNode::compute_method_id(std::string method) { + td::int64 method_id; + if (!convert_int64(method, method_id)) { + method_id = (td::crc16(td::Slice{method}) & 0xffff) | 0x10000; } + return method_id; +} + +bool TestNode::parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid, + std::string method_name, bool ext_mode) { + auto R = vm::parse_stack_entries(td::Slice(parse_ptr_, parse_end_)); + if (R.is_error()) { + return set_error(R.move_as_error().to_string()); + } + parse_ptr_ = parse_end_; + auto P = td::PromiseCreator::lambda([](td::Result> R) { + if (R.is_error()) { + LOG(ERROR) << R.move_as_error(); + } + }); + return start_run_method(workchain, addr, ref_blkid, method_name, R.move_as_ok(), ext_mode ? 0x1f : 0, std::move(P)); +} + +bool TestNode::start_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid, + std::string method_name, std::vector params, int mode, + td::Promise> promise) { if (!ref_blkid.is_valid()) { return set_error("must obtain last block information before making other queries"); } @@ -1041,28 +1086,308 @@ bool TestNode::parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress a return set_error("server connection not ready"); } auto a = ton::create_tl_object(workchain, addr); - auto b = ton::serialize_tl_object(ton::create_tl_object( - ton::create_tl_lite_block_id(ref_blkid), std::move(a)), - true); - LOG(INFO) << "requesting account state for " << workchain << ":" << addr.to_hex() << " with respect to " - << ref_blkid.to_str() << " to run method " << method_name << " with " << params.size() << " parameters"; - return envelope_send_query( - std::move(b), [ Self = actor_id(this), workchain, addr, ref_blkid, method_name, - params = std::move(params) ](td::Result R) mutable { + if (!mode) { + auto b = ton::serialize_tl_object(ton::create_tl_object( + ton::create_tl_lite_block_id(ref_blkid), std::move(a)), + true); + LOG(INFO) << "requesting account state for " << workchain << ":" << addr.to_hex() << " with respect to " + << ref_blkid.to_str() << " to run method " << method_name << " with " << params.size() << " parameters"; + return envelope_send_query(std::move(b), [ + Self = actor_id(this), workchain, addr, ref_blkid, method_name, params = std::move(params), + promise = std::move(promise) + ](td::Result R) mutable { + if (R.is_error()) { + promise.set_error(R.move_as_error()); + return; + } + auto F = ton::fetch_tl_object(R.move_as_ok(), true); + if (F.is_error()) { + LOG(ERROR) << "cannot parse answer to liteServer.getAccountState"; + promise.set_error(td::Status::Error("cannot parse answer to liteServer.getAccountState")); + } else { + auto f = F.move_as_ok(); + td::actor::send_closure_later(Self, &TestNode::run_smc_method, 0, ref_blkid, ton::create_block_id(f->id_), + ton::create_block_id(f->shardblk_), std::move(f->shard_proof_), + std::move(f->proof_), std::move(f->state_), workchain, addr, method_name, + std::move(params), td::BufferSlice(), td::BufferSlice(), td::BufferSlice(), + -0x10000, std::move(promise)); + } + }); + } else { + td::int64 method_id = compute_method_id(method_name); + // set serialization limits + vm::FakeVmStateLimits fstate(1000); // limit recursive (de)serialization calls + vm::VmStateInterface::Guard guard(&fstate); + // serialize parameters + vm::CellBuilder cb; + Ref cell; + if (!(vm::Stack{params}.serialize(cb) && cb.finalize_to(cell))) { + return set_error("cannot serialize stack with get-method parameters"); + } + auto stk = vm::std_boc_serialize(std::move(cell)); + if (stk.is_error()) { + return set_error("cannot serialize stack with get-method parameters : "s + stk.move_as_error().to_string()); + } + auto b = ton::serialize_tl_object( + ton::create_tl_object(mode, ton::create_tl_lite_block_id(ref_blkid), + std::move(a), method_id, stk.move_as_ok()), + true); + LOG(INFO) << "requesting remote get-method execution for " << workchain << ":" << addr.to_hex() + << " with respect to " << ref_blkid.to_str() << " to run method " << method_name << " with " + << params.size() << " parameters"; + return envelope_send_query(std::move(b), [ + Self = actor_id(this), workchain, addr, ref_blkid, method_name, mode, params = std::move(params), + promise = std::move(promise) + ](td::Result R) mutable { + if (R.is_error()) { + promise.set_error(R.move_as_error()); + return; + } + auto F = ton::fetch_tl_object(R.move_as_ok(), true); + if (F.is_error()) { + LOG(ERROR) << "cannot parse answer to liteServer.runSmcMethod"; + promise.set_error(td::Status::Error("cannot parse answer to liteServer.runSmcMethod")); + } else { + auto f = F.move_as_ok(); + td::actor::send_closure_later(Self, &TestNode::run_smc_method, mode, ref_blkid, ton::create_block_id(f->id_), + ton::create_block_id(f->shardblk_), std::move(f->shard_proof_), + std::move(f->proof_), std::move(f->state_proof_), workchain, addr, method_name, + std::move(params), std::move(f->init_c7_), std::move(f->lib_extras_), + std::move(f->result_), f->exit_code_, std::move(promise)); + } + }); + } +} + +bool TestNode::dns_resolve_start(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, + std::string domain, int cat, int mode) { + if (domain.size() > 1023) { + return set_error("domain name too long"); + } + if (domain.size() >= 2 && domain[0] == '"' && domain.back() == '"') { + domain.erase(0, 1); + domain.pop_back(); + } + std::vector components; + std::size_t i, p = 0; + for (i = 0; i < domain.size(); i++) { + if (!domain[i] || (unsigned char)domain[i] >= 0xfe || (unsigned char)domain[i] <= ' ') { + return set_error("invalid characters in a domain name"); + } + if (domain[i] == '.') { + if (i == p) { + return set_error("domain name cannot have an empty component"); + } + components.emplace_back(domain, p, i - p); + p = i + 1; + } + } + if (i > p) { + components.emplace_back(domain, p, i - p); + } + std::string qdomain, qdomain0; + while (!components.empty()) { + qdomain += components.back(); + qdomain += '\0'; + components.pop_back(); + } + + if (!(ready_ && !client_.empty())) { + return set_error("server connection not ready"); + } + + if (workchain == ton::workchainInvalid) { + if (dns_root_queried_) { + workchain = ton::masterchainId; + addr = dns_root_; + } else { + auto P = td::PromiseCreator::lambda([this, blkid, domain, cat, mode](td::Result R) { if (R.is_error()) { - return; - } - auto F = ton::fetch_tl_object(R.move_as_ok(), true); - if (F.is_error()) { - LOG(ERROR) << "cannot parse answer to liteServer.getAccountState"; + LOG(ERROR) << "cannot obtain root dns address from configuration: " << R.move_as_error(); + } else if (dns_root_queried_) { + dns_resolve_start(ton::masterchainId, dns_root_, blkid, domain, cat, mode); } else { - auto f = F.move_as_ok(); - td::actor::send_closure_later(Self, &TestNode::run_smc_method, ref_blkid, ton::create_block_id(f->id_), - ton::create_block_id(f->shardblk_), std::move(f->shard_proof_), - std::move(f->proof_), std::move(f->state_), workchain, addr, method_name, - std::move(params)); + LOG(ERROR) << "cannot obtain root dns address from configuration parameter #4"; } }); + return get_config_params(mc_last_id_, std::move(P), 0x5000, "", {4}); + } + } + return dns_resolve_send(workchain, addr, blkid, domain, qdomain, cat, mode); +} + +bool TestNode::dns_resolve_send(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, + std::string domain, std::string qdomain, int cat, int mode) { + LOG(INFO) << "dns_resolve for '" << domain << "' category=" << cat << " mode=" << mode + << " starting from smart contract " << workchain << ":" << addr.to_hex() << " with respect to block " + << blkid.to_str(); + std::string qdomain0; + if (qdomain.size() <= 127) { + qdomain0 = qdomain; + } else { + qdomain0 = std::string{qdomain, 0, 127}; + qdomain[125] = '\xff'; + qdomain[126] = '\x0'; + } + vm::CellBuilder cb; + Ref cell; + if (!(cb.store_bytes_bool(td::Slice(qdomain0)) && cb.finalize_to(cell))) { + return set_error("cannot store domain name into slice"); + } + std::vector params; + params.emplace_back(vm::load_cell_slice_ref(std::move(cell))); + params.emplace_back(td::make_refint(cat)); + auto P = td::PromiseCreator::lambda([this, workchain, addr, blkid, domain, qdomain, cat, + mode](td::Result> R) { + if (R.is_error()) { + LOG(ERROR) << R.move_as_error(); + return; + } + auto S = R.move_as_ok(); + if (S.size() < 2 || !S[S.size() - 2].is_int() || !(S.back().is_cell() || S.back().is_null())) { + LOG(ERROR) << "dnsresolve did not return a value of type (int,cell)"; + return; + } + auto cell = S.back().as_cell(); + S.pop_back(); + auto x = S.back().as_int(); + S.clear(); + if (!x->signed_fits_bits(32)) { + LOG(ERROR) << "invalid integer result of dnsresolve (" << x << ")"; + return; + } + return dns_resolve_finish(workchain, addr, blkid, domain, qdomain, cat, mode, (int)x->to_long(), std::move(cell)); + }); + return start_run_method(workchain, addr, blkid, "dnsresolve", std::move(params), 0x1f, std::move(P)); +} + +bool TestNode::show_dns_record(std::ostream& os, int cat, Ref value, bool raw_dump) { + if (raw_dump) { + bool ok = show_dns_record(os, cat, value, false); + if (!ok) { + os << "cannot parse dns record; raw value: "; + vm::load_cell_slice(value).print_rec(print_limit_, os); + } + return ok; + } + if (value.is_null()) { + os << "(null)"; + return true; + } + // block::gen::t_DNSRecord.print_ref(print_limit_, os, value); + if (!block::gen::t_DNSRecord.validate_ref(value)) { + return false; + } + block::gen::t_DNSRecord.print_ref(print_limit_, os, value); + auto cs = vm::load_cell_slice(value); + auto tag = block::gen::t_DNSRecord.get_tag(cs); + ton::WorkchainId wc; + ton::StdSmcAddress addr; + switch (tag) { + case block::gen::DNSRecord::dns_adnl_address: { + block::gen::DNSRecord::Record_dns_adnl_address rec; + if (tlb::unpack_exact(cs, rec)) { + os << "\n\tadnl address " << rec.adnl_addr.to_hex() << " = " << td::adnl_id_encode(rec.adnl_addr, true); + } + break; + } + case block::gen::DNSRecord::dns_smc_address: { + block::gen::DNSRecord::Record_dns_smc_address rec; + if (tlb::unpack_exact(cs, rec) && block::tlb::t_MsgAddressInt.extract_std_address(rec.smc_addr, wc, addr)) { + os << "\tsmart contract " << wc << ":" << addr.to_hex() << " = " << block::StdAddress{wc, addr}.rserialize(true); + } + break; + } + case block::gen::DNSRecord::dns_next_resolver: { + block::gen::DNSRecord::Record_dns_next_resolver rec; + if (tlb::unpack_exact(cs, rec) && block::tlb::t_MsgAddressInt.extract_std_address(rec.resolver, wc, addr)) { + os << "\tnext resolver " << wc << ":" << addr.to_hex() << " = " << block::StdAddress{wc, addr}.rserialize(true); + } + break; + } + } + return true; +} + +void TestNode::dns_resolve_finish(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, + std::string domain, std::string qdomain, int cat, int mode, int used_bits, + Ref value) { + if (used_bits <= 0) { + td::TerminalIO::out() << "domain '" << domain << "' not found" << std::endl; + return; + } + if ((used_bits & 7) || (unsigned)used_bits > 8 * std::min(qdomain.size(), 126)) { + LOG(ERROR) << "too many bits used (" << used_bits << " out of " << qdomain.size() * 8 << ")"; + return; + } + int pos = (used_bits >> 3); + if (qdomain[pos - 1]) { + LOG(ERROR) << "domain split not at a component boundary"; + return; + } + bool end = ((std::size_t)pos == qdomain.size()); + if (!end) { + LOG(INFO) << "partial information obtained"; + if (value.is_null()) { + td::TerminalIO::out() << "domain '" << domain << "' not found: no next resolver" << std::endl; + return; + } + Ref nx_address; + ton::WorkchainId nx_wc; + ton::StdSmcAddress nx_addr; + if (!(block::gen::t_DNSRecord.cell_unpack_dns_next_resolver(value, nx_address) && + block::tlb::t_MsgAddressInt.extract_std_address(std::move(nx_address), nx_wc, nx_addr))) { + LOG(ERROR) << "cannot parse next resolver info for " << domain.substr(qdomain.size() - pos); + std::ostringstream out; + vm::load_cell_slice(value).print_rec(print_limit_, out); + td::TerminalIO::err() << out.str() << std::endl; + return; + } + LOG(INFO) << "next resolver is " << nx_wc << ":" << nx_addr.to_hex(); + if ((mode & 1)) { + return; // no recursive resolving + } + if (!(dns_resolve_send(nx_wc, nx_addr, blkid, domain, qdomain.substr(pos), cat, mode))) { + LOG(ERROR) << "cannot send next dns query"; + return; + } + LOG(INFO) << "recursive dns query to '" << domain.substr(qdomain.size() - pos) << "' sent"; + return; + } + auto out = td::TerminalIO::out(); + out << "Result for domain '" << domain << "' category " << cat << (cat ? "" : " (all categories)") << std::endl; + try { + if (value.not_null()) { + std::ostringstream os0; + vm::load_cell_slice(value).print_rec(print_limit_, os0); + out << "raw data: " << os0.str() << std::endl; + } + if (!cat) { + vm::Dictionary dict{value, 16}; + if (!dict.check_for_each([this, &out](Ref cs, td::ConstBitPtr key, int n) { + CHECK(n == 16); + int x = (int)key.get_int(16); + if (cs.is_null() || cs->size_ext() != 0x10000) { + out << "category #" << x << " : value is not a reference" << std::endl; + return false; + } + std::ostringstream os; + (void)show_dns_record(os, x, cs->prefetch_ref(), true); + out << "category #" << x << " : " << os.str() << std::endl; + return true; + })) { + out << "invalid dns record dictionary" << std::endl; + } + } else { + std::ostringstream os; + (void)show_dns_record(os, cat, value, true); + out << "category #" << cat << " : " << os.str() << std::endl; + } + } catch (vm::VmError& err) { + LOG(ERROR) << "vm error while traversing dns resolve result: " << err.get_msg(); + } catch (vm::VmVirtError& err) { + LOG(ERROR) << "vm virtualization error while traversing dns resolve result: " << err.get_msg(); + } } bool TestNode::get_one_transaction(ton::BlockIdExt blkid, ton::WorkchainId workchain, ton::StdSmcAddress addr, @@ -1150,8 +1475,8 @@ void TestNode::got_account_state(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, t if (info.root.not_null()) { out << "account state is "; std::ostringstream outp; - block::gen::t_Account.print_ref(outp, info.root); - vm::load_cell_slice(info.root).print_rec(outp); + block::gen::t_Account.print_ref(print_limit_, outp, info.root); + vm::load_cell_slice(info.root).print_rec(print_limit_, outp); out << outp.str(); out << "last transaction lt = " << info.last_trans_lt << " hash = " << info.last_trans_hash.to_hex() << std::endl; block::gen::Account::Record_account acc; @@ -1223,87 +1548,152 @@ void TestNode::got_account_state(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, t } } -void TestNode::run_smc_method(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk, +void TestNode::run_smc_method(int mode, ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk, td::BufferSlice shard_proof, td::BufferSlice proof, td::BufferSlice state, ton::WorkchainId workchain, ton::StdSmcAddress addr, std::string method, - std::vector params) { - LOG(INFO) << "got account state for " << workchain << ":" << addr.to_hex() << " with respect to blocks " - << blk.to_str() << (shard_blk == blk ? "" : std::string{" and "} + shard_blk.to_str()); - block::AccountState account_state; - account_state.blk = blk; - account_state.shard_blk = shard_blk; - account_state.shard_proof = std::move(shard_proof); - account_state.proof = std::move(proof); - account_state.state = std::move(state); - auto r_info = account_state.validate(ref_blk, block::StdAddress(workchain, addr)); - if (r_info.is_error()) { - LOG(ERROR) << r_info.error().message(); - return; - } + std::vector params, td::BufferSlice remote_c7, + td::BufferSlice remote_libs, td::BufferSlice remote_result, int remote_exit_code, + td::Promise> promise) { + LOG(INFO) << "got (partial) account state with mode=" << mode << " for " << workchain << ":" << addr.to_hex() + << " with respect to blocks " << blk.to_str() + << (shard_blk == blk ? "" : std::string{" and "} + shard_blk.to_str()); auto out = td::TerminalIO::out(); - auto info = r_info.move_as_ok(); - if (info.root.is_null()) { - LOG(ERROR) << "account state of " << workchain << ":" << addr.to_hex() << " is empty (cannot run method `" << method - << "`)"; - return; - } - block::gen::Account::Record_account acc; - block::gen::AccountStorage::Record store; - block::CurrencyCollection balance; - if (!(tlb::unpack_cell(info.root, acc) && tlb::csr_unpack(acc.storage, store) && - balance.validate_unpack(store.balance))) { - LOG(ERROR) << "error unpacking account state"; - return; - } - int tag = block::gen::t_AccountState.get_tag(*store.state); - switch (tag) { - case block::gen::AccountState::account_uninit: - LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() << " not initialized yet (cannot run any methods)"; + try { + block::AccountState account_state; + account_state.blk = blk; + account_state.shard_blk = shard_blk; + account_state.shard_proof = std::move(shard_proof); + account_state.proof = std::move(proof); + LOG(DEBUG) << "serialized state is " << state.size() << " bytes"; + LOG(DEBUG) << "serialized remote c7 is " << remote_c7.size() << " bytes"; + account_state.state = std::move(state); + account_state.is_virtualized = (mode > 0); + auto r_info = account_state.validate(ref_blk, block::StdAddress(workchain, addr)); + if (r_info.is_error()) { + LOG(ERROR) << r_info.error().message(); + promise.set_error(r_info.move_as_error()); return; - case block::gen::AccountState::account_frozen: - LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() << " frozen (cannot run any methods)"; + } + auto out = td::TerminalIO::out(); + auto info = r_info.move_as_ok(); + if (info.root.is_null()) { + LOG(ERROR) << "account state of " << workchain << ":" << addr.to_hex() << " is empty (cannot run method `" + << method << "`)"; + promise.set_error(td::Status::Error(PSLICE() << "account state of " << workchain << ":" << addr.to_hex() + << " is empty (cannot run method `" << method << "`)")); return; - } - CHECK(store.state.write().fetch_ulong(1) == 1); // account_init$1 _:StateInit = AccountState; - block::gen::StateInit::Record state_init; - CHECK(tlb::csr_unpack(store.state, state_init)); - auto code = state_init.code->prefetch_ref(); - auto data = state_init.data->prefetch_ref(); - auto stack = td::make_ref(std::move(params)); - td::int64 method_id; - if (!convert_int64(method, method_id)) { - method_id = (td::crc16(td::Slice{method}) & 0xffff) | 0x10000; - } - stack.write().push_smallint(method_id); - { - std::ostringstream os; - os << "arguments: "; - stack->dump(os); - out << os.str(); - } - long long gas_limit = vm::GasLimits::infty; - // OstreamLogger ostream_logger(ctx.error_stream); - // auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr); - vm::GasLimits gas{gas_limit}; - LOG(DEBUG) << "creating VM"; - vm::VmState vm{code, std::move(stack), gas, 1, data, vm::VmLog()}; - vm.set_c7(liteclient::prepare_vm_c7(info.gen_utime, info.gen_lt, acc.addr, balance)); // tuple with SmartContractInfo - // vm.incr_stack_trace(1); // enable stack dump after each step - LOG(INFO) << "starting VM to run method `" << method << "` (" << method_id << ") of smart contract " << workchain - << ":" << addr.to_hex(); - int exit_code = ~vm.run(); - LOG(DEBUG) << "VM terminated with exit code " << exit_code; - if (exit_code != 0) { - LOG(ERROR) << "VM terminated with error code " << exit_code; - out << "result: error " << exit_code << std::endl; - return; - } - stack = vm.get_stack_ref(); - { - std::ostringstream os; - os << "result: "; - stack->dump(os); - out << os.str(); + } + if (false) { + // DEBUG (dump state) + std::ostringstream os; + vm::CellSlice{vm::NoVm(), info.true_root}.print_rec(print_limit_, os); + out << "dump of account state (proof): " << os.str() << std::endl; + } + // set deserialization limits + vm::FakeVmStateLimits fstate(1000); // limit recursive (de)serialization calls + vm::VmStateInterface::Guard guard(&fstate); + if (false && remote_c7.size()) { + // DEBUG (dump remote_c7) + auto r_c7 = vm::std_boc_deserialize(remote_c7).move_as_ok(); + std::ostringstream os; + vm::StackEntry val; + bool ok = val.deserialize(r_c7); + val.dump(os); + // os << std::endl; + // block::gen::t_VmStackValue.print_ref(print_limit_, os, r_c7); + // os << std::endl; + // vm::CellSlice{vm::NoVmOrd(), r_c7}.print_rec(print_limit_, os); + out << "remote_c7 (deserialized=" << ok << "): " << os.str() << std::endl; + } + block::gen::Account::Record_account acc; + block::gen::AccountStorage::Record store; + block::CurrencyCollection balance; + if (!(tlb::unpack_cell(info.root, acc) && tlb::csr_unpack(acc.storage, store) && + balance.validate_unpack(store.balance))) { + LOG(ERROR) << "error unpacking account state"; + promise.set_error(td::Status::Error("error unpacking account state")); + return; + } + int tag = block::gen::t_AccountState.get_tag(*store.state); + switch (tag) { + case block::gen::AccountState::account_uninit: + LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() + << " not initialized yet (cannot run any methods)"; + return; + case block::gen::AccountState::account_frozen: + LOG(ERROR) << "account " << workchain << ":" << addr.to_hex() << " frozen (cannot run any methods)"; + return; + } + CHECK(store.state.write().fetch_ulong(1) == 1); // account_init$1 _:StateInit = AccountState; + block::gen::StateInit::Record state_init; + CHECK(tlb::csr_unpack(store.state, state_init)); + auto code = state_init.code->prefetch_ref(); + auto data = state_init.data->prefetch_ref(); + auto stack = td::make_ref(std::move(params)); + td::int64 method_id = compute_method_id(method); + stack.write().push_smallint(method_id); + { + std::ostringstream os; + os << "arguments: "; + stack->dump(os, 3); + out << os.str(); + } + long long gas_limit = vm::GasLimits::infty; + // OstreamLogger ostream_logger(ctx.error_stream); + // auto log = create_vm_log(ctx.error_stream ? &ostream_logger : nullptr); + vm::GasLimits gas{gas_limit}; + LOG(DEBUG) << "creating VM"; + vm::VmState vm{code, std::move(stack), gas, 1, data, vm::VmLog()}; + vm.set_c7(liteclient::prepare_vm_c7(info.gen_utime, info.gen_lt, td::make_ref(acc.addr->clone()), + balance)); // tuple with SmartContractInfo + // vm.incr_stack_trace(1); // enable stack dump after each step + LOG(INFO) << "starting VM to run method `" << method << "` (" << method_id << ") of smart contract " << workchain + << ":" << addr.to_hex(); + int exit_code = ~vm.run(); + LOG(DEBUG) << "VM terminated with exit code " << exit_code; + if (mode > 0) { + LOG(DEBUG) << "remote VM exit code is " << remote_exit_code; + } + if (exit_code != 0) { + LOG(ERROR) << "VM terminated with error code " << exit_code; + out << "result: error " << exit_code << std::endl; + promise.set_error(td::Status::Error(PSLICE() << "VM terminated with non-zero exit code " << exit_code)); + return; + } + stack = vm.get_stack_ref(); + { + std::ostringstream os; + os << "result: "; + stack->dump(os, 3); + out << os.str(); + } + if (mode & 4) { + if (remote_result.empty()) { + out << "remote result: , exit code " << remote_exit_code; + } else { + auto res = vm::std_boc_deserialize(std::move(remote_result)); + if (res.is_error()) { + LOG(ERROR) << "cannot deserialize remote VM result boc: " << res.move_as_error(); + return; + } + auto cs = vm::load_cell_slice(res.move_as_ok()); + Ref remote_stack; + if (!(vm::Stack::deserialize_to(cs, remote_stack, 0) && cs.empty_ext())) { + LOG(ERROR) << "remote VM result boc cannot be deserialized as a VmStack"; + return; + } + std::ostringstream os; + os << "remote result (not to be trusted): "; + remote_stack->dump(os, 3); + out << os.str(); + } + } + out.flush(); + promise.set_result(stack->extract_contents()); + } catch (vm::VmVirtError& err) { + out << "virtualization error while parsing runSmcMethod result: " << err.get_msg(); + } catch (vm::VmError& err) { + out << "error while parsing runSmcMethod result: " << err.get_msg(); } } @@ -1386,8 +1776,8 @@ void TestNode::got_one_transaction(ton::BlockIdExt req_blkid, ton::BlockIdExt bl } else { out << "transaction is "; std::ostringstream outp; - block::gen::t_Transaction.print_ref(outp, root); - vm::load_cell_slice(root).print_rec(outp); + block::gen::t_Transaction.print_ref(print_limit_, outp, root, 0); + vm::load_cell_slice(root).print_rec(print_limit_, outp); out << outp.str(); } } @@ -1512,8 +1902,8 @@ void TestNode::got_last_transactions(std::vector blkids, td::Bu out << "transaction #" << c << " from block " << blkid.to_str() << (dump ? " is " : "\n"); if (dump) { std::ostringstream outp; - block::gen::t_Transaction.print_ref(outp, info.transaction); - vm::load_cell_slice(info.transaction).print_rec(outp); + block::gen::t_Transaction.print_ref(print_limit_, outp, info.transaction); + vm::load_cell_slice(info.transaction).print_rec(print_limit_, outp); out << outp.str(); } block::gen::Transaction::Record trans; @@ -1641,8 +2031,8 @@ void TestNode::got_all_shards(ton::BlockIdExt blk, td::BufferSlice proof, td::Bu auto out = td::TerminalIO::out(); out << "shard configuration is "; std::ostringstream outp; - block::gen::t_ShardHashes.print_ref(outp, root); - vm::load_cell_slice(root).print_rec(outp); + block::gen::t_ShardHashes.print_ref(print_limit_, outp, root); + vm::load_cell_slice(root).print_rec(print_limit_, outp); out << outp.str(); block::ShardConfig sh_conf; if (!sh_conf.unpack(vm::load_cell_slice_ref(root))) { @@ -1665,26 +2055,35 @@ void TestNode::got_all_shards(ton::BlockIdExt blk, td::BufferSlice proof, td::Bu show_new_blkids(); } -bool TestNode::get_config_params(ton::BlockIdExt blkid, int mode, std::string filename) { - std::vector params; - if (mode >= 0 && !seekeoln()) { +bool TestNode::get_config_params(ton::BlockIdExt blkid, td::Promise do_after, int mode, std::string filename, + std::vector params) { + if (mode < 0) { + mode = 0x8000; + } + if (!(mode & 0x9000) && !seekeoln()) { mode |= 0x1000; while (!seekeoln()) { int x; if (!convert_int32(get_word(), x)) { + do_after.set_error(td::Status::Error("integer configuration parameter id expected")); return set_error("integer configuration parameter id expected"); } params.push_back(x); } } if (!(ready_ && !client_.empty())) { + do_after.set_error(td::Status::Error("integer configuration parameter id expected")); return set_error("server connection not ready"); } if (!blkid.is_masterchain_ext()) { + do_after.set_error(td::Status::Error("integer configuration parameter id expected")); return set_error("only masterchain blocks contain configuration"); } + if (blkid == mc_last_id_) { + mode |= 0x2000; + } auto params_copy = params; - auto b = (mode & 0x3000) == 0x1000 + auto b = (mode & 0x1000) ? ton::serialize_tl_object(ton::create_tl_object( 0, ton::create_tl_lite_block_id(blkid), std::move(params_copy)), true) @@ -1693,9 +2092,11 @@ bool TestNode::get_config_params(ton::BlockIdExt blkid, int mode, std::string fi true); LOG(INFO) << "requesting " << params.size() << " configuration parameters with respect to masterchain block " << blkid.to_str(); - return envelope_send_query(std::move(b), [ Self = actor_id(this), mode, filename, blkid, - params = std::move(params) ](td::Result R) mutable { + return envelope_send_query(std::move(b), [ + Self = actor_id(this), mode, filename, blkid, params = std::move(params), do_after = std::move(do_after) + ](td::Result R) mutable { if (R.is_error()) { + do_after.set_error(R.move_as_error()); return; } auto F = ton::fetch_tl_object(R.move_as_ok(), true); @@ -1705,13 +2106,14 @@ bool TestNode::get_config_params(ton::BlockIdExt blkid, int mode, std::string fi auto f = F.move_as_ok(); td::actor::send_closure_later(Self, &TestNode::got_config_params, blkid, ton::create_block_id(f->id_), std::move(f->state_proof_), std::move(f->config_proof_), mode, filename, - std::move(params)); + std::move(params), std::move(do_after)); } }); } void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, td::BufferSlice state_proof, - td::BufferSlice cfg_proof, int mode, std::string filename, std::vector params) { + td::BufferSlice cfg_proof, int mode, std::string filename, std::vector params, + td::Promise do_after) { LOG(INFO) << "got configuration parameters"; if (!blkid.is_masterchain_ext()) { LOG(ERROR) << "reference block " << blkid.to_str() << " for the configuration is not a valid masterchain block"; @@ -1734,7 +2136,7 @@ void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blki return; } auto config = res.move_as_ok(); - if (mode < 0) { + if (mode & 0x8000) { auto F = vm::std_boc_serialize(config->get_root_cell(), 2); if (F.is_error()) { LOG(ERROR) << "cannot serialize configuration: " << F.move_as_error().to_string(); @@ -1760,26 +2162,32 @@ void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blki } else { std::ostringstream os; if (i >= 0) { - block::gen::ConfigParam{i}.print_ref(os, value); + block::gen::ConfigParam{i}.print_ref(print_limit_, os, value); os << std::endl; } - vm::load_cell_slice(value).print_rec(os); + vm::load_cell_slice(value).print_rec(print_limit_, os); out << os.str() << std::endl; + if (i == 4 && (mode & 0x2000)) { + register_config_param4(value); + } } } } else { - config->foreach_config_param([&out](int i, Ref value) { + config->foreach_config_param([this, &out, mode](int i, Ref value) { out << "ConfigParam(" << i << ") = "; if (value.is_null()) { out << "(null)\n"; } else { std::ostringstream os; if (i >= 0) { - block::gen::ConfigParam{i}.print_ref(os, value); + block::gen::ConfigParam{i}.print_ref(print_limit_, os, value); os << std::endl; } - vm::load_cell_slice(value).print_rec(os); + vm::load_cell_slice(value).print_rec(print_limit_, os); out << os.str() << std::endl; + if (i == 4 && (mode & 0x2000)) { + register_config_param4(value); + } } return true; }); @@ -1789,6 +2197,25 @@ void TestNode::got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blki } catch (vm::VmVirtError& err) { LOG(ERROR) << "virtualization error while traversing configuration: " << err.get_msg(); } + do_after.set_result(td::Unit()); +} + +bool TestNode::register_config_param4(Ref value) { + if (value.is_null()) { + return false; + } + vm::CellSlice cs{vm::NoVmOrd(), std::move(value)}; + ton::StdSmcAddress addr; + if (cs.size_ext() == 256 && cs.fetch_bits_to(addr)) { + dns_root_queried_ = true; + if (dns_root_ != addr) { + dns_root_ = addr; + LOG(INFO) << "dns root set to -1:" << addr.to_hex(); + } + return true; + } else { + return false; + } } bool TestNode::get_block(ton::BlockIdExt blkid, bool dump) { @@ -1882,8 +2309,8 @@ void TestNode::got_block(ton::BlockIdExt blkid, td::BufferSlice data, bool dump) auto out = td::TerminalIO::out(); out << "block contents is "; std::ostringstream outp; - block::gen::t_Block.print_ref(outp, root); - vm::load_cell_slice(root).print_rec(outp); + block::gen::t_Block.print_ref(print_limit_, outp, root); + vm::load_cell_slice(root).print_rec(print_limit_, outp); out << outp.str(); show_block_header(blkid, std::move(root), 0xffff); } else { @@ -1938,8 +2365,8 @@ void TestNode::got_state(ton::BlockIdExt blkid, ton::RootHash root_hash, ton::Fi auto out = td::TerminalIO::out(); out << "shard state contents is "; std::ostringstream outp; - block::gen::t_ShardState.print_ref(outp, root); - vm::load_cell_slice(root).print_rec(outp); + block::gen::t_ShardState.print_ref(print_limit_, outp, root); + vm::load_cell_slice(root).print_rec(print_limit_, outp); out << outp.str(); show_state_header(blkid, std::move(root), 0xffff); } else { @@ -2073,8 +2500,8 @@ void TestNode::got_block_header(ton::BlockIdExt blkid, td::BufferSlice data, int } auto root = res.move_as_ok(); std::ostringstream outp; - vm::CellSlice cs{vm::NoVm{}, root}; - cs.print_rec(outp); + vm::CellSlice cs{vm::NoVm(), root}; + cs.print_rec(print_limit_, outp); td::TerminalIO::out() << outp.str(); try { auto virt_root = vm::MerkleProof::virtualize(root, 1); @@ -2173,6 +2600,107 @@ void TestNode::got_block_proof(ton::BlockIdExt from, ton::BlockIdExt to, int mod show_new_blkids(); } +bool TestNode::get_creator_stats(ton::BlockIdExt blkid, int mode, unsigned req_count, ton::Bits256 start_after, + ton::UnixTime min_utime) { + if (!(ready_ && !client_.empty())) { + return set_error("server connection not ready"); + } + if (!blkid.is_masterchain_ext()) { + return set_error("only masterchain blocks contain block creator statistics"); + } + if (!(mode & 1)) { + start_after.set_zero(); + } + auto b = ton::serialize_tl_object(ton::create_tl_object( + mode, ton::create_tl_lite_block_id(blkid), req_count, start_after, min_utime), + true); + LOG(INFO) << "requesting up to " << req_count << " block creator stats records with respect to masterchain block " + << blkid.to_str() << " starting from validator public key " << start_after.to_hex() << " created after " + << min_utime << " (mode=" << mode << ")"; + return envelope_send_query(std::move(b), [ Self = actor_id(this), mode, blkid, req_count, start_after, + min_utime ](td::Result R) { + if (R.is_error()) { + return; + } + auto F = ton::fetch_tl_object(R.move_as_ok(), true); + if (F.is_error()) { + LOG(ERROR) << "cannot parse answer to liteServer.getValidatorStats"; + } else { + auto f = F.move_as_ok(); + td::actor::send_closure_later(Self, &TestNode::got_creator_stats, blkid, ton::create_block_id(f->id_), mode, + f->mode_, start_after, min_utime, std::move(f->state_proof_), + std::move(f->data_proof_), f->count_, req_count, f->complete_); + } + }); +} + +void TestNode::got_creator_stats(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, int req_mode, int mode, + td::Bits256 start_after, ton::UnixTime min_utime, td::BufferSlice state_proof, + td::BufferSlice data_proof, int count, int req_count, bool complete) { + LOG(INFO) << "got answer to getValidatorStats query: " << count << " records out of " << req_count << ", " + << (complete ? "complete" : "incomplete"); + if (!blkid.is_masterchain_ext()) { + LOG(ERROR) << "reference block " << blkid.to_str() + << " for block creator statistics is not a valid masterchain block"; + return; + } + if (count > req_count) { + LOG(ERROR) << "obtained " << count << " answers to getValidatorStats query, but only " << req_count + << " were requested"; + return; + } + if (blkid != req_blkid) { + LOG(ERROR) << "answer to getValidatorStats refers to masterchain block " << blkid.to_str() + << " different from requested " << req_blkid.to_str(); + return; + } + auto R = block::check_extract_state_proof(blkid, state_proof.as_slice(), data_proof.as_slice()); + if (R.is_error()) { + LOG(ERROR) << "masterchain state proof for " << blkid.to_str() << " is invalid : " << R.move_as_error().to_string(); + return; + } + bool allow_eq = (mode & 3) != 1; + ton::Bits256 key{start_after}; + std::ostringstream os; + try { + auto dict = block::get_block_create_stats_dict(R.move_as_ok()); + if (!dict) { + LOG(ERROR) << "cannot extract BlockCreateStats from mc state"; + return; + } + for (int i = 0; i < count + (int)complete; i++) { + auto v = dict->lookup_nearest_key(key, true, allow_eq); + if (v.is_null()) { + if (i != count) { + LOG(ERROR) << "could fetch only " << i << " CreatorStats entries out of " << count + << " declared in answer to getValidatorStats"; + return; + } + break; + } + block::DiscountedCounter mc_cnt, shard_cnt; + if (!block::unpack_CreatorStats(std::move(v), mc_cnt, shard_cnt)) { + LOG(ERROR) << "invalid CreatorStats record with key " << key.to_hex(); + return; + } + if (mc_cnt.modified_since(min_utime) || shard_cnt.modified_since(min_utime)) { + os << key.to_hex() << " mc_cnt:" << mc_cnt << " shard_cnt:" << shard_cnt << std::endl; + } + allow_eq = false; + } + if (complete) { + os << "(complete)" << std::endl; + } else { + os << "(incomplete, repeat query from " << key.to_hex() << " )" << std::endl; + } + td::TerminalIO::out() << os.str(); + } catch (vm::VmError& err) { + LOG(ERROR) << "error while traversing block creator stats: " << err.get_msg(); + } catch (vm::VmVirtError& err) { + LOG(ERROR) << "virtualization error while traversing block creator stats: " << err.get_msg(); + } +} + int main(int argc, char* argv[]) { SET_VERBOSITY_LEVEL(verbosity_INFO); td::set_default_failure_signal_handler(); @@ -2205,6 +2733,11 @@ int main(int argc, char* argv[]) { td::actor::send_closure(x, &TestNode::set_db_root, fname.str()); return td::Status::OK(); }); + p.add_option('L', "print-limit", "sets maximum count of recursively printed objects", [&](td::Slice arg) { + auto plimit = td::to_integer(arg); + td::actor::send_closure(x, &TestNode::set_print_limit, plimit); + return plimit >= 0 ? td::Status::OK() : td::Status::Error("printing limit must be non-negative"); + }); p.add_option('v', "verbosity", "set verbosity level", [&](td::Slice arg) { verbosity = td::to_integer(arg); SET_VERBOSITY_LEVEL(VERBOSITY_NAME(FATAL) + verbosity); @@ -2257,7 +2790,7 @@ int main(int argc, char* argv[]) { }); #endif - vm::init_op_cp0(); + vm::init_op_cp0(true); // enable vm debug td::actor::Scheduler scheduler({2}); diff --git a/submodules/ton/tonlib-src/lite-client/lite-client.h b/submodules/ton/tonlib-src/lite-client/lite-client.h index 36830e8d5b..7ebaaf1781 100644 --- a/submodules/ton/tonlib-src/lite-client/lite-client.h +++ b/submodules/ton/tonlib-src/lite-client/lite-client.h @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "adnl/adnl-ext-client.h" @@ -50,6 +50,7 @@ class TestNode : public td::actor::Actor { bool readline_enabled_ = true; bool server_ok_ = false; td::int32 liteserver_idx_ = -1; + int print_limit_ = 1024; bool ready_ = false; bool inited_ = false; @@ -66,6 +67,9 @@ class TestNode : public td::actor::Actor { ton::BlockIdExt last_block_id_, last_state_id_; td::BufferSlice last_block_data_, last_state_data_; + ton::StdSmcAddress dns_root_; + bool dns_root_queried_{false}; + std::string line_; const char *parse_ptr_, *parse_end_; td::Status error_; @@ -93,6 +97,9 @@ class TestNode : public td::actor::Actor { }; void run_init_queries(); + char cur() const { + return *parse_ptr_; + } bool get_server_time(); bool get_server_version(int mode = 0); void got_server_version(td::Result res, int mode); @@ -114,16 +121,32 @@ class TestNode : public td::actor::Actor { td::BufferSlice shard_proof, td::BufferSlice proof, td::BufferSlice state, ton::WorkchainId workchain, ton::StdSmcAddress addr, std::string filename, int mode); bool parse_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid, - std::string method_name); - void run_smc_method(ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk, + std::string method_name, bool ext_mode); + bool start_run_method(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt ref_blkid, + std::string method_name, std::vector params, int mode, + td::Promise> promise); + void run_smc_method(int mode, ton::BlockIdExt ref_blk, ton::BlockIdExt blk, ton::BlockIdExt shard_blk, td::BufferSlice shard_proof, td::BufferSlice proof, td::BufferSlice state, ton::WorkchainId workchain, ton::StdSmcAddress addr, std::string method, - std::vector params); + std::vector params, td::BufferSlice remote_c7, td::BufferSlice remote_libs, + td::BufferSlice remote_result, int remote_exit_code, + td::Promise> promise); + bool register_config_param4(Ref value); + bool dns_resolve_start(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, std::string domain, + int cat, int mode); + bool dns_resolve_send(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, std::string domain, + std::string qdomain, int cat, int mode); + void dns_resolve_finish(ton::WorkchainId workchain, ton::StdSmcAddress addr, ton::BlockIdExt blkid, + std::string domain, std::string qdomain, int cat, int mode, int used_bits, + Ref value); + bool show_dns_record(std::ostream& os, int cat, Ref value, bool raw_dump); bool get_all_shards(bool use_last = true, ton::BlockIdExt blkid = {}); void got_all_shards(ton::BlockIdExt blk, td::BufferSlice proof, td::BufferSlice data); - bool get_config_params(ton::BlockIdExt blkid, int mode = 0, std::string filename = ""); + bool get_config_params(ton::BlockIdExt blkid, td::Promise do_after, int mode = 0, std::string filename = "", + std::vector params = {}); void got_config_params(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, td::BufferSlice state_proof, - td::BufferSlice cfg_proof, int mode, std::string filename, std::vector params); + td::BufferSlice cfg_proof, int mode, std::string filename, std::vector params, + td::Promise do_after); bool get_block(ton::BlockIdExt blk, bool dump = false); void got_block(ton::BlockIdExt blkid, td::BufferSlice data, bool dump); bool get_state(ton::BlockIdExt blk, bool dump = false); @@ -150,10 +173,18 @@ class TestNode : public td::actor::Actor { std::vector trans, td::BufferSlice proof); bool get_block_proof(ton::BlockIdExt from, ton::BlockIdExt to, int mode); void got_block_proof(ton::BlockIdExt from, ton::BlockIdExt to, int mode, td::BufferSlice res); + bool get_creator_stats(ton::BlockIdExt blkid, int mode, unsigned req_count, ton::Bits256 start_after, + ton::UnixTime min_utime); + void got_creator_stats(ton::BlockIdExt req_blkid, ton::BlockIdExt blkid, int req_mode, int mode, + td::Bits256 start_after, ton::UnixTime min_utime, td::BufferSlice state_proof, + td::BufferSlice data_proof, int count, int req_count, bool complete); + // parser bool do_parse_line(); bool show_help(std::string command); - std::string get_word(char delim = ' '); + td::Slice get_word(char delim = ' '); + td::Slice get_word_ext(const char* delims, const char* specials = nullptr); bool get_word_to(std::string& str, char delim = ' '); + bool get_word_to(td::Slice& str, char delim = ' '); int skipspc(); std::string get_line_tail(bool remove_spaces = true) const; bool eoln() const; @@ -161,25 +192,31 @@ class TestNode : public td::actor::Actor { bool set_error(td::Status error); bool set_error(std::string err_msg); void show_context() const; - bool parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr); + bool parse_account_addr(ton::WorkchainId& wc, ton::StdSmcAddress& addr, bool allow_none = false); static int parse_hex_digit(int c); static bool parse_hash(const char* str, ton::Bits256& hash); - static bool convert_uint64(std::string word, td::uint64& val); - static bool convert_int64(std::string word, td::int64& val); - static bool convert_uint32(std::string word, td::uint32& val); - static bool convert_int32(std::string word, td::int32& val); - static bool convert_shard_id(std::string str, ton::ShardIdFull& shard); + static bool parse_hash(td::Slice str, ton::Bits256& hash); + static bool convert_uint64(td::Slice word, td::uint64& val); + static bool convert_int64(td::Slice word, td::int64& val); + static bool convert_uint32(td::Slice word, td::uint32& val); + static bool convert_int32(td::Slice word, td::int32& val); + static bool convert_shard_id(td::Slice str, ton::ShardIdFull& shard); + static td::int64 compute_method_id(std::string method); bool parse_hash(ton::Bits256& hash); bool parse_lt(ton::LogicalTime& lt); bool parse_uint32(td::uint32& val); + bool parse_int32(td::int32& val); + bool parse_int16(int& val); bool parse_shard_id(ton::ShardIdFull& shard); bool parse_block_id_ext(ton::BlockIdExt& blkid, bool allow_incomplete = false); bool parse_block_id_ext(std::string blk_id_string, ton::BlockIdExt& blkid, bool allow_incomplete = false) const; bool parse_stack_value(td::Slice str, vm::StackEntry& value); bool parse_stack_value(vm::StackEntry& value); + bool parse_stack_values(std::vector& values); bool register_blkid(const ton::BlockIdExt& blkid); bool show_new_blkids(bool all = false); bool complete_blkid(ton::BlockId partial_blkid, ton::BlockIdExt& complete_blkid) const; + td::Promise trivial_promise(); public: void conn_ready() { @@ -222,6 +259,11 @@ class TestNode : public td::actor::Actor { fail_timeout_ = ts; alarm_timestamp().relax(fail_timeout_); } + void set_print_limit(int plimit) { + if (plimit >= 0) { + print_limit_ = plimit; + } + } void add_cmd(td::BufferSlice data) { ex_mode_ = true; ex_queries_.push_back(std::move(data)); diff --git a/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp b/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp index 442bb84c61..deddcb22ce 100644 --- a/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp +++ b/submodules/ton/tonlib-src/tdactor/benchmark/benchmark.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "third_party/FAAArrayQueue.h" #include "third_party/HazardPointers.h" @@ -56,7 +56,10 @@ extern "C" { #include "td/utils/Random.h" #include "td/utils/Slice.h" #include "td/utils/Status.h" +#include "td/utils/StealingQueue.h" +#include "td/utils/ThreadSafeCounter.h" #include "td/utils/UInt.h" +#include "td/utils/VectorQueue.h" #include #include @@ -796,10 +799,13 @@ class MpmcQueueBenchmark : public td::Benchmark { std::vector m_threads(m_); auto impl = std::make_unique(n_ + m_ + 1); size_t thread_id = 0; + td::ThreadSafeCounter counter; + CHECK(counter.sum() == 0); for (auto &thread : m_threads) { thread = td::thread([&, thread_id] { while (true) { size_t value = impl->pop(thread_id); + counter.add(-static_cast(value)); if (!value) { break; } @@ -811,6 +817,7 @@ class MpmcQueueBenchmark : public td::Benchmark { thread = td::thread([&, thread_id] { for (int i = 0; i < n / n_; i++) { impl->push(static_cast(i + 1), thread_id); + counter.add(i + 1); } }); thread_id++; @@ -818,7 +825,10 @@ class MpmcQueueBenchmark : public td::Benchmark { for (auto &thread : n_threads) { thread.join(); } - for (int i = 0; i < m_; i++) { + while (counter.sum() != 0) { + td::this_thread::yield(); + } + for (int i = 0; i < m_ + n_ + 1; i++) { impl->push(0, thread_id); } for (auto &thread : m_threads) { @@ -832,6 +842,62 @@ class MpmcQueueBenchmark : public td::Benchmark { int m_; }; +template +class MpmcQueueBenchmark2 : public td::Benchmark { + public: + MpmcQueueBenchmark2(int n, int k) : n_(n), k_(k) { + } + std::string get_description() const override { + return PSTRING() << "MpmcQueueBenchmark2 " << n_ << " " << k_ << " " << Impl::get_description(); + } + + void run(int n) override { + std::vector n_threads(n_); + auto impl = std::make_unique(n_ + 1); + size_t thread_id = 0; + std::atomic left{k_}; + + for (int i = 0; i < k_; i++) { + impl->push(n, thread_id); + } + + for (auto &thread : n_threads) { + thread = td::thread([&, thread_id] { + while (true) { + size_t value = impl->pop(thread_id); + if (value > 1) { + impl->push(value - 1, thread_id); + } + if (value == 1) { + left--; + } + if (!value) { + break; + } + } + }); + thread_id++; + } + + while (left.load() != 0) { + td::this_thread::yield(); + } + + for (int i = 0; i < n_ + 1; i++) { + impl->push(0, thread_id); + } + + for (auto &thread : n_threads) { + thread.join(); + } + impl.reset(); + } + + private: + int n_; + int k_; +}; + class Cheat { public: explicit Cheat(size_t thread_n) : impl_(static_cast(thread_n)) { @@ -959,26 +1025,95 @@ std::string CfQueueT, Cell>::get_description() { template class MoodyQueue { public: - explicit MoodyQueue(size_t) { + explicit MoodyQueue(size_t n) { + for (size_t i = 0; i < n; i++) { + p.push_back(moodycamel::ProducerToken(q)); + c.push_back(moodycamel::ConsumerToken(q)); + } } static std::string get_description() { return "moodycamel queue"; } - void push(Value v, size_t) { - q.enqueue(v); + void push(Value v, size_t tid) { + q.enqueue(p[tid], v); } - Value pop(size_t) { + Value pop(size_t tid) { Value res; - while (!q.try_dequeue(res)) { + while (!q.try_dequeue(c[tid], res)) { } + //q.wait_dequeue(c[tid], res); return res; } - bool try_pop(Value &value, size_t) { - return q.try_dequeue(value); + bool try_pop(Value &value, size_t tid) { + return q.try_dequeue(c[tid], value); } private: moodycamel::ConcurrentQueue q; + std::vector p; + std::vector c; +}; + +struct Sem { + public: + void post() { + if (++cnt_ == 0) { + { + std::unique_lock lk(mutex_); + } + cnd_.notify_one(); + } + } + void wait(int cnt = 1) { + auto was = cnt_.fetch_sub(cnt); + if (was >= cnt) { + return; + } + std::unique_lock lk(mutex_); + cnd_.wait(lk, [&] { return cnt_ >= 0; }); + } + + private: + std::mutex mutex_; + std::condition_variable cnd_; + std::atomic cnt_{0}; +}; + +template +class MagicQueue { + public: + explicit MagicQueue(size_t n) : n_(n), qs_(n_ - 1), pos_{0} { + } + static std::string get_description() { + return "magic queue"; + } + void push(Value v, size_t tid) { + if (v == 0) { + return; + } + + if (tid + 1 == n_) { + qs_[pos_].push(v); + pos_ = (pos_ + 1) % (n_ - 1); + } else { + qs_[tid].push(v); + } + } + Value pop(size_t tid) { + CHECK(tid + 1 != n_); + if (qs_[tid].empty()) { + return 0; + } + return qs_[tid].pop(); + } + bool try_pop(Value &value, size_t) { + UNREACHABLE(); + } + + private: + size_t n_; + std::vector> qs_; + size_t pos_; }; #if TG_LCR_QUEUE @@ -1110,65 +1245,155 @@ class WaitQueue { static std::string get_description() { return "Wait + " + Q::get_description(); } - explicit WaitQueue(size_t threads_n) : impl(threads_n) { + + explicit WaitQueue(size_t threads_n) : impl(threads_n), slots(threads_n) { + for (size_t i = 0; i < threads_n; i++) { + waiter.init_slot(slots[i].slot, static_cast(i)); + } } + T pop(size_t thread_id) { T res; - int yields = 0; - while (!impl.try_pop(res, thread_id)) { - yields = waiter.wait(yields, static_cast(thread_id)); + while (true) { + if (slots[thread_id].local_queue.try_pop(res)) { + break; + } + if (impl.try_pop(res, thread_id)) { + break; + } + waiter.wait(slots[thread_id].slot); } - waiter.stop_wait(yields, static_cast(thread_id)); + waiter.stop_wait(slots[thread_id].slot); + //LOG(ERROR) << "GOT"; return res; } + + void push_local(T value, size_t thread_id) { + auto o_value = slots[thread_id].local_queue.push(value); + if (o_value) { + push(o_value.unwrap, thread_id); + } + } + void push(T value, size_t thread_id) { - impl.push(std::move(value), static_cast(thread_id)); + impl.push(value, static_cast(thread_id)); waiter.notify(); } private: W waiter; Q impl; + struct Slot { + typename W::Slot slot; + td::actor::core::LocalQueue local_queue; + }; + std::vector slots; +}; +template +class StealingWaitQueue { + public: + static std::string get_description() { + return "StealWait + " + Q::get_description(); + } + + explicit StealingWaitQueue(size_t threads_n) : impl(threads_n), slots(threads_n) { + for (size_t i = 0; i < threads_n; i++) { + waiter.init_slot(slots[i].slot, static_cast(i)); + } + } + + T pop(size_t thread_id) { + T res; + while (true) { + if (slots[thread_id].stealing_queue.local_pop(res)) { + break; + } + if (slots[thread_id].local_queue.try_pop(res)) { + break; + } + if (impl.try_pop(res, thread_id)) { + break; + } + + bool ok = false; + for (size_t i = 1; i < slots.size(); i++) { + auto pos = (i + thread_id) % slots.size(); + if (slots[thread_id].stealing_queue.steal(res, slots[pos].stealing_queue)) { + ok = true; + break; + } + } + if (ok) { + break; + } + waiter.wait(slots[thread_id].slot); + } + waiter.stop_wait(slots[thread_id].slot); + //LOG(ERROR) << "GOT"; + return res; + } + + void push_local(T value, size_t thread_id) { + auto o_value = slots[thread_id].local_queue.push(value); + if (o_value) { + push(o_value.unwrap, thread_id); + } + } + + void push(T value, size_t thread_id) { + slots[thread_id].stealing_queue.local_push(value, + [&](auto value) { impl.push(value, static_cast(thread_id)); }); + waiter.notify(); + } + + private: + W waiter; + Q impl; + struct Slot { + typename W::Slot slot; + td::actor::core::LocalQueue local_queue; + td::StealingQueue stealing_queue; + }; + std::vector slots; }; void run_queue_bench(int n, int m) { - bench(MpmcQueueBenchmark, td::MpmcWaiter, size_t>>(n, m), 2); - bench(MpmcQueueBenchmark>(n, m), 2); - bench(MpmcQueueBenchmark>(n, m), 2); - bench(MpmcQueueBenchmark(n, m), 2); - bench(MpmcQueueBenchmark>>(n, m), 2); - bench(MpmcQueueBenchmark>>(n, m), 2); - bench(MpmcQueueBenchmark>(n, m), 2); + bench(MpmcQueueBenchmark>(n, m), 2); + bench(MpmcQueueBenchmark, td::MpmcEagerWaiter, size_t>>(n, m), 2); + bench(MpmcQueueBenchmark, td::MpmcSleepyWaiter, size_t>>(n, m), 2); + bench(MpmcQueueBenchmark, td::MpmcEagerWaiter, size_t>>(n, m), 2); + bench(MpmcQueueBenchmark, td::MpmcSleepyWaiter, size_t>>(n, m), 2); + //bench(MpmcQueueBenchmark>(n, m), 2); + //bench(MpmcQueueBenchmark>(n, m), 2); + //bench(MpmcQueueBenchmark(n, m), 2); + //bench(MpmcQueueBenchmark>>(n, m), 2); + //bench(MpmcQueueBenchmark>>(n, m), 2); + //bench(MpmcQueueBenchmark>(n, m), 2); + //bench(MpmcQueueBenchmark(n, m), 2); #if TG_LCR_QUEUE bench(MpmcQueueBenchmark>>(n, m), 2); #endif } +void run_queue_bench2(int n, int k) { + bench(MpmcQueueBenchmark2, td::MpmcSleepyWaiter, size_t>>(n, k), 2); + bench(MpmcQueueBenchmark2, td::MpmcEagerWaiter, size_t>>(n, k), 2); + bench(MpmcQueueBenchmark2>(n, k), 2); + bench(MpmcQueueBenchmark2>(n, k), 2); + bench(MpmcQueueBenchmark2, td::MpmcEagerWaiter, size_t>>(n, k), 2); + bench(MpmcQueueBenchmark2, td::MpmcSleepyWaiter, size_t>>(n, k), 2); + //bench(MpmcQueueBenchmark2>(n, k), 2); + //bench(MpmcQueueBenchmark2>(n, k), 2); + //bench(MpmcQueueBenchmark2(n, k), 2); + //bench(MpmcQueueBenchmark2>>(n, k), 2); + //bench(MpmcQueueBenchmark2>>(n, k), 2); + //bench(MpmcQueueBenchmark2>(n, k), 2); -struct Sem { - public: - void post() { - if (++cnt_ == 0) { - { - std::unique_lock lk(mutex_); - } - cnd_.notify_one(); - } - } - void wait(int cnt = 1) { - auto was = cnt_.fetch_sub(cnt); - if (was >= cnt) { - return; - } - std::unique_lock lk(mutex_); - cnd_.wait(lk, [&] { return cnt_ >= 0; }); - } - - private: - std::mutex mutex_; - std::condition_variable cnd_; - std::atomic cnt_{0}; -}; + //bench(MpmcQueueBenchmark(n, m), 2); +#if TG_LCR_QUEUE + bench(MpmcQueueBenchmark2>>(n, k), 2); +#endif +} class ChainedSpawn : public td::Benchmark { public: @@ -1415,17 +1640,18 @@ class YieldMany : public td::Benchmark { int main(int argc, char **argv) { if (argc > 1) { if (argv[1][0] == 'a') { - bench_n(MpmcQueueBenchmark>(1, 1), 1 << 26); + bench_n(MpmcQueueBenchmark2, td::MpmcEagerWaiter, size_t>>(50, 1), 1 << 26); + //bench_n(MpmcQueueBenchmark>(1, 1), 1 << 26); //bench_n(MpmcQueueBenchmark(1, 40), 1 << 20); //bench_n(MpmcQueueBenchmark>>(1, 40), 1 << 20); } else { - bench_n(MpmcQueueBenchmark>(1, 1), 1 << 26); + bench_n(MpmcQueueBenchmark2, td::MpmcSleepyWaiter, size_t>>(50, 1), 1 << 26); + //bench_n(MpmcQueueBenchmark>(1, 1), 1 << 26); //bench_n(MpmcQueueBenchmark>>(1, 40), 1 << 20); //bench_n(MpmcQueueBenchmark>>(1, 1), 1 << 26); } return 0; } - bench(YieldMany(false)); bench(YieldMany(true)); bench(SpawnMany(false)); @@ -1436,6 +1662,22 @@ int main(int argc, char **argv) { bench(ChainedSpawnInplace(true)); bench(ChainedSpawn(false)); bench(ChainedSpawn(true)); + + run_queue_bench(10, 10); + run_queue_bench(10, 1); + run_queue_bench(1, 10); + run_queue_bench(1, 1); + run_queue_bench(2, 10); + run_queue_bench(2, 2); + run_queue_bench(10, 1); + + run_queue_bench2(50, 1); + run_queue_bench2(50, 2); + run_queue_bench2(1, 100); + run_queue_bench2(1, 1000); + run_queue_bench2(10, 2); + run_queue_bench2(10, 1000); + return 0; bench(ActorDummyQuery()); @@ -1466,16 +1708,5 @@ int main(int argc, char **argv) { bench(CalcHashSha256Benchmark>>>()); bench(CalcHashSha256Benchmark>>>()); - run_queue_bench(1, 10); - run_queue_bench(1, 1); - run_queue_bench(2, 10); - run_queue_bench(2, 2); - run_queue_bench(10, 10); - - run_queue_bench(2, 2); - run_queue_bench(1, 10); - run_queue_bench(10, 1); - run_queue_bench(10, 10); - return 0; } diff --git a/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h b/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h index 936a2f5fcd..1c7cf80143 100644 --- a/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h +++ b/submodules/ton/tonlib-src/tdactor/benchmark/third_party/MoodyCamelQueue.h @@ -269,17 +269,17 @@ static inline thread_id_t thread_id() { namespace moodycamel { namespace details { #if defined(__GNUC__) -inline bool likely(bool x) { +static inline bool(likely)(bool x) { return __builtin_expect((x), true); } -inline bool unlikely(bool x) { +static inline bool(unlikely)(bool x) { return __builtin_expect((x), false); } #else -inline bool likely(bool x) { +static inline bool(likely)(bool x) { return x; } -inline bool unlikely(bool x) { +static inline bool(unlikely)(bool x) { return x; } #endif @@ -300,8 +300,8 @@ struct const_numeric_max { : static_cast(-1); }; -#if defined(__GNUC__) && !defined(__clang__) -typedef ::max_align_t std_max_align_t; // GCC forgot to add it to std:: for a while +#if defined(__GLIBCXX__) +typedef ::max_align_t std_max_align_t; // libstdc++ forgot to add it to std:: for a while #else typedef std::max_align_t std_max_align_t; // Others (e.g. MSVC) insist it can *only* be accessed via std:: #endif @@ -377,8 +377,8 @@ struct ConcurrentQueueDefaultTraits { static const size_t MAX_SUBQUEUE_SIZE = details::const_numeric_max::value; #ifndef MCDBGQ_USE_RELACY -// Memory allocation can be customized if needed. -// malloc should return nullptr on failure, and handle alignment like std::malloc. + // Memory allocation can be customized if needed. + // malloc should return nullptr on failure, and handle alignment like std::malloc. #if defined(malloc) || defined(free) // Gah, this is 2015, stop defining macros that break standard code already! // Work around malloc/free being special macros: @@ -1140,7 +1140,7 @@ class ConcurrentQueue { // If there was at least one non-empty queue but it appears empty at the time // we try to dequeue from it, we need to make sure every queue's been tried if (nonEmptyCount > 0) { - if (details::likely(best->dequeue(item))) { + if ((details::likely)(best->dequeue(item))) { return true; } for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) { @@ -1335,7 +1335,10 @@ class ConcurrentQueue { private: friend struct ProducerToken; friend struct ConsumerToken; + struct ExplicitProducer; friend struct ExplicitProducer; + struct ImplicitProducer; + friend struct ImplicitProducer; friend class ConcurrentQueueTests; enum AllocationMode { CanAlloc, CannotAlloc }; @@ -1380,7 +1383,7 @@ class ConcurrentQueue { } auto prodCount = producerCount.load(std::memory_order_relaxed); auto globalOffset = globalExplicitConsumerOffset.load(std::memory_order_relaxed); - if (details::unlikely(token.desiredProducer == nullptr)) { + if ((details::unlikely)(token.desiredProducer == nullptr)) { // Aha, first time we're dequeueing anything. // Figure out our local position // Note: offset is from start, not end, but we're traversing from end -- subtract from count first @@ -1442,7 +1445,7 @@ class ConcurrentQueue { FreeList& operator=(FreeList const&) MOODYCAMEL_DELETE_FUNCTION; inline void add(N* node) { -#if MCDBGQ_NOLOCKFREE_FREELIST +#ifdef MCDBGQ_NOLOCKFREE_FREELIST debug::DebugLock lock(mutex); #endif // We know that the should-be-on-freelist bit is 0 at this point, so it's safe to @@ -1455,7 +1458,7 @@ class ConcurrentQueue { } inline N* try_get() { -#if MCDBGQ_NOLOCKFREE_FREELIST +#ifdef MCDBGQ_NOLOCKFREE_FREELIST debug::DebugLock lock(mutex); #endif auto head = freeListHead.load(std::memory_order_acquire); @@ -1529,7 +1532,7 @@ class ConcurrentQueue { static const std::uint32_t REFS_MASK = 0x7FFFFFFF; static const std::uint32_t SHOULD_BE_ON_FREELIST = 0x80000000; -#if MCDBGQ_NOLOCKFREE_FREELIST +#ifdef MCDBGQ_NOLOCKFREE_FREELIST debug::DebugMutex mutex; #endif }; @@ -1548,7 +1551,7 @@ class ConcurrentQueue { , freeListNext(nullptr) , shouldBeOnFreeList(false) , dynamicallyAllocated(true) { -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM owner = nullptr; #endif } @@ -1679,14 +1682,14 @@ class ConcurrentQueue { std::atomic shouldBeOnFreeList; bool dynamicallyAllocated; // Perhaps a better name for this would be 'isNotPartOfInitialBlockPool' -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM void* owner; #endif }; static_assert(std::alignment_of::value >= std::alignment_of::value, "Internal error: Blocks must be at least as aligned as the type they are wrapping"); -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM public: struct MemStats; @@ -1756,7 +1759,7 @@ class ConcurrentQueue { ConcurrentQueue* parent; protected: -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM friend struct MemStats; #endif }; @@ -1902,7 +1905,7 @@ class ConcurrentQueue { if (newBlock == nullptr) { return false; } -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM newBlock->owner = this; #endif newBlock->ConcurrentQueue::Block::template reset_empty(); @@ -1916,7 +1919,7 @@ class ConcurrentQueue { ++pr_blockIndexSlotsUsed; } - if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward(element)))) { + if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward(element)))) { // The constructor may throw. We want the element not to appear in the queue in // that case (without corrupting the queue): MOODYCAMEL_TRY { @@ -1941,7 +1944,7 @@ class ConcurrentQueue { blockIndex.load(std::memory_order_relaxed)->front.store(pr_blockIndexFront, std::memory_order_release); pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1); - if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward(element)))) { + if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward(element)))) { this->tailIndex.store(newTailIndex, std::memory_order_release); return true; } @@ -1985,13 +1988,14 @@ class ConcurrentQueue { // incremented after dequeueOptimisticCount -- this is enforced in the `else` block below), and since we now // have a version of dequeueOptimisticCount that is at least as recent as overcommit (due to the release upon // incrementing dequeueOvercommit and the acquire above that synchronizes with it), overcommit <= myDequeueCount. - assert(overcommit <= myDequeueCount); + // However, we can't assert this since both dequeueOptimisticCount and dequeueOvercommit may (independently) + // overflow; in such a case, though, the logic still holds since the difference between the two is maintained. // Note that we reload tail here in case it changed; it will be the same value as before or greater, since // this load is sequenced after (happens after) the earlier load above. This is supported by read-read // coherency (as defined in the standard), explained here: http://en.cppreference.com/w/cpp/atomic/memory_order tail = this->tailIndex.load(std::memory_order_acquire); - if (details::likely(details::circular_less_than(myDequeueCount - overcommit, tail))) { + if ((details::likely)(details::circular_less_than(myDequeueCount - overcommit, tail))) { // Guaranteed to be at least one element to dequeue! // Get the index. Note that since there's guaranteed to be at least one element, this @@ -2033,10 +2037,10 @@ class ConcurrentQueue { } } guard = {block, index}; - element = std::move(el); + element = std::move(el); // NOLINT } else { - element = std::move(el); - el.~T(); + element = std::move(el); // NOLINT + el.~T(); // NOLINT block->ConcurrentQueue::Block::template set_empty(index); } @@ -2119,7 +2123,7 @@ class ConcurrentQueue { return false; } -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM newBlock->owner = this; #endif newBlock->ConcurrentQueue::Block::template set_all_empty(); @@ -2151,7 +2155,8 @@ class ConcurrentQueue { block = block->next; } - if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))) { + if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), + new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))) { blockIndex.load(std::memory_order_relaxed) ->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release); } @@ -2172,7 +2177,8 @@ class ConcurrentQueue { if (details::circular_less_than(newTailIndex, stopIndex)) { stopIndex = newTailIndex; } - if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))) { + if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), + new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))) { while (currentTailIndex != stopIndex) { new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++); } @@ -2186,9 +2192,10 @@ class ConcurrentQueue { // may only define a (noexcept) move constructor, and so calls to the // cctor will not compile, even if they are in an if branch that will never // be executed - new ((*this->tailBlock)[currentTailIndex]) T( - details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR( - T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst)); + new ((*this->tailBlock)[currentTailIndex]) + T(details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR( + T, decltype(*itemFirst), + new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst)); ++currentTailIndex; ++itemFirst; } @@ -2236,7 +2243,7 @@ class ConcurrentQueue { this->tailBlock = this->tailBlock->next; } - if (!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst))) && + if (!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new ((T*)nullptr) T(details::deref_noexcept(itemFirst))) && firstAllocatedBlock != nullptr) { blockIndex.load(std::memory_order_relaxed) ->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release); @@ -2257,7 +2264,7 @@ class ConcurrentQueue { std::atomic_thread_fence(std::memory_order_acquire); auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed); - assert(overcommit <= myDequeueCount); + ; tail = this->tailIndex.load(std::memory_order_acquire); auto actualCount = static_cast(tail - (myDequeueCount - overcommit)); @@ -2418,7 +2425,7 @@ class ConcurrentQueue { private: #endif -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM friend struct MemStats; #endif }; @@ -2500,7 +2507,7 @@ class ConcurrentQueue { (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head))) { return false; } -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX debug::DebugLock lock(mutex); #endif // Find out where we'll be inserting this block in the block index @@ -2516,12 +2523,12 @@ class ConcurrentQueue { idxEntry->value.store(nullptr, std::memory_order_relaxed); return false; } -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM newBlock->owner = this; #endif newBlock->ConcurrentQueue::Block::template reset_empty(); - if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward(element)))) { + if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward(element)))) { // May throw, try to insert now before we publish the fact that we have this new block MOODYCAMEL_TRY { new ((*newBlock)[currentTailIndex]) T(std::forward(element)); @@ -2539,7 +2546,7 @@ class ConcurrentQueue { this->tailBlock = newBlock; - if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (nullptr) T(std::forward(element)))) { + if (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new ((T*)nullptr) T(std::forward(element)))) { this->tailIndex.store(newTailIndex, std::memory_order_release); return true; } @@ -2562,9 +2569,8 @@ class ConcurrentQueue { std::atomic_thread_fence(std::memory_order_acquire); index_t myDequeueCount = this->dequeueOptimisticCount.fetch_add(1, std::memory_order_relaxed); - assert(overcommit <= myDequeueCount); tail = this->tailIndex.load(std::memory_order_acquire); - if (details::likely(details::circular_less_than(myDequeueCount - overcommit, tail))) { + if ((details::likely)(details::circular_less_than(myDequeueCount - overcommit, tail))) { index_t index = this->headIndex.fetch_add(1, std::memory_order_acq_rel); // Determine which block the element is in @@ -2575,7 +2581,7 @@ class ConcurrentQueue { auto& el = *((*block)[index]); if (!MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, element = std::move(el))) { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX // Note: Acquiring the mutex with every dequeue instead of only when a block // is released is very sub-optimal, but it is, after all, purely debug code. debug::DebugLock lock(producer->mutex); @@ -2595,14 +2601,14 @@ class ConcurrentQueue { } } guard = {block, index, entry, this->parent}; - element = std::move(el); + element = std::move(el); // NOLINT } else { - element = std::move(el); - el.~T(); + element = std::move(el); // NOLINT + el.~T(); // NOLINT if (block->ConcurrentQueue::Block::template set_empty(index)) { { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX debug::DebugLock lock(mutex); #endif // Add the block back into the global free pool (and remove from block index) @@ -2642,7 +2648,7 @@ class ConcurrentQueue { ((startTailIndex - 1) & ~static_cast(BLOCK_SIZE - 1)); index_t currentTailIndex = (startTailIndex - 1) & ~static_cast(BLOCK_SIZE - 1); if (blockBaseDiff > 0) { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX debug::DebugLock lock(mutex); #endif do { @@ -2679,7 +2685,7 @@ class ConcurrentQueue { return false; } -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM newBlock->owner = this; #endif newBlock->ConcurrentQueue::Block::template reset_empty(); @@ -2714,16 +2720,18 @@ class ConcurrentQueue { if (details::circular_less_than(newTailIndex, stopIndex)) { stopIndex = newTailIndex; } - if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))) { + if (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), + new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))) { while (currentTailIndex != stopIndex) { new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++); } } else { MOODYCAMEL_TRY { while (currentTailIndex != stopIndex) { - new ((*this->tailBlock)[currentTailIndex]) T( - details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR( - T, decltype(*itemFirst), new (nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst)); + new ((*this->tailBlock)[currentTailIndex]) + T(details::nomove_if<(bool)!MOODYCAMEL_NOEXCEPT_CTOR( + T, decltype(*itemFirst), + new ((T*)nullptr) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst)); ++currentTailIndex; ++itemFirst; } @@ -2788,7 +2796,6 @@ class ConcurrentQueue { std::atomic_thread_fence(std::memory_order_acquire); auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed); - assert(overcommit <= myDequeueCount); tail = this->tailIndex.load(std::memory_order_acquire); auto actualCount = static_cast(tail - (myDequeueCount - overcommit)); @@ -2843,7 +2850,7 @@ class ConcurrentQueue { if (block->ConcurrentQueue::Block::template set_many_empty( blockStartIndex, static_cast(endIndex - blockStartIndex))) { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX debug::DebugLock lock(mutex); #endif entry->value.store(nullptr, std::memory_order_relaxed); @@ -2865,7 +2872,7 @@ class ConcurrentQueue { if (block->ConcurrentQueue::Block::template set_many_empty( blockStartIndex, static_cast(endIndex - blockStartIndex))) { { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX debug::DebugLock lock(mutex); #endif // Note that the set_many_empty above did a release, meaning that anybody who acquires the block @@ -2945,7 +2952,7 @@ class ConcurrentQueue { } inline size_t get_block_index_index_for_index(index_t index, BlockIndexHeader*& localBlockIndex) const { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX debug::DebugLock lock(mutex); #endif index &= ~static_cast(BLOCK_SIZE - 1); @@ -3026,10 +3033,10 @@ class ConcurrentQueue { private: #endif -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX mutable debug::DebugMutex mutex; #endif -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM friend struct MemStats; #endif }; @@ -3065,7 +3072,7 @@ class ConcurrentQueue { } inline void add_block_to_free_list(Block* block) { -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM block->owner = nullptr; #endif freeList.add(block); @@ -3103,7 +3110,7 @@ class ConcurrentQueue { return nullptr; } -#if MCDBGQ_TRACKMEM +#ifdef MCDBGQ_TRACKMEM public: struct MemStats { size_t allocatedBlocks; @@ -3221,7 +3228,7 @@ class ConcurrentQueue { } ProducerBase* recycle_or_create_producer(bool isExplicit, bool& recycled) { -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH debug::DebugLock lock(implicitProdMutex); #endif // Try to re-use one first @@ -3386,7 +3393,7 @@ class ConcurrentQueue { // Code and algorithm adapted from http://preshing.com/20130605/the-worlds-simplest-lock-free-hash-table -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH debug::DebugLock lock(implicitProdMutex); #endif @@ -3443,6 +3450,7 @@ class ConcurrentQueue { // Insert! auto newCount = 1 + implicitProducerHashCount.fetch_add(1, std::memory_order_relaxed); while (true) { + // NOLINTNEXTLINE(clang-analyzer-core.NullDereference) if (newCount >= (mainHash->capacity >> 1) && !implicitProducerHashResizeInProgress.test_and_set(std::memory_order_acquire)) { // We've acquired the resize lock, try to allocate a bigger hash table. @@ -3538,8 +3546,8 @@ class ConcurrentQueue { // Remove from thread exit listeners details::ThreadExitNotifier::unsubscribe(&producer->threadExitListener); -// Remove from hash -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH + // Remove from hash +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH debug::DebugLock lock(implicitProdMutex); #endif auto hash = implicitProducerHash.load(std::memory_order_acquire); @@ -3650,7 +3658,7 @@ class ConcurrentQueue { std::atomic nextExplicitConsumerId; std::atomic globalExplicitConsumerOffset; -#if MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH +#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH debug::DebugMutex implicitProdMutex; #endif diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h index e2574c0dbf..974192938a 100644 --- a/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h +++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/ActorInfo.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -41,6 +41,7 @@ class ActorInfo : private HeapNode, private ListNode { } ~ActorInfo() { VLOG(actor) << "Destroy actor [" << name_ << "]"; + CHECK(!actor_); } bool is_alive() const { diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp index e047eab12a..d752560ddc 100644 --- a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp +++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.cpp @@ -14,13 +14,15 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/actor/core/CpuWorker.h" #include "td/actor/core/ActorExecutor.h" #include "td/actor/core/SchedulerContext.h" +#include "td/actor/core/Scheduler.h" // FIXME: afer LocalQueue is in a separate file + namespace td { namespace actor { namespace core { @@ -28,20 +30,64 @@ void CpuWorker::run() { auto thread_id = get_thread_id(); auto &dispatcher = *SchedulerContext::get(); - int yields = 0; + MpmcWaiter::Slot slot; + waiter_.init_slot(slot, thread_id); while (true) { SchedulerMessage message; - if (queue_.try_pop(message, thread_id)) { + if (try_pop(message, thread_id)) { + waiter_.stop_wait(slot); if (!message) { return; } ActorExecutor executor(*message, dispatcher, ActorExecutor::Options().with_from_queue()); - yields = waiter_.stop_wait(yields, thread_id); } else { - yields = waiter_.wait(yields, thread_id); + waiter_.wait(slot); } } } + +bool CpuWorker::try_pop_local(SchedulerMessage &message) { + SchedulerMessage::Raw *raw_message; + if (local_queues_[id_].try_pop(raw_message)) { + message = SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message); + return true; + } + return false; +} + +bool CpuWorker::try_pop_global(SchedulerMessage &message, size_t thread_id) { + SchedulerMessage::Raw *raw_message; + if (queue_.try_pop(raw_message, thread_id)) { + message = SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message); + return true; + } + return false; +} + +bool CpuWorker::try_pop(SchedulerMessage &message, size_t thread_id) { + if (++cnt_ == 51) { + cnt_ = 0; + if (try_pop_global(message, thread_id) || try_pop_local(message)) { + return true; + } + } else { + if (try_pop_local(message) || try_pop_global(message, thread_id)) { + return true; + } + } + + for (size_t i = 1; i < local_queues_.size(); i++) { + size_t pos = (i + id_) % local_queues_.size(); + SchedulerMessage::Raw *raw_message; + if (local_queues_[id_].steal(raw_message, local_queues_[pos])) { + message = SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message); + return true; + } + } + + return false; +} + } // namespace core } // namespace actor } // namespace td diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h index 63cb337b4d..d9f32513b7 100644 --- a/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h +++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/CpuWorker.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -22,19 +22,32 @@ #include "td/utils/MpmcQueue.h" #include "td/utils/MpmcWaiter.h" +#include "td/utils/Span.h" namespace td { namespace actor { namespace core { +template +struct LocalQueue; class CpuWorker { public: - CpuWorker(MpmcQueue &queue, MpmcWaiter &waiter) : queue_(queue), waiter_(waiter) { + CpuWorker(MpmcQueue &queue, MpmcWaiter &waiter, size_t id, + MutableSpan> local_queues) + : queue_(queue), waiter_(waiter), id_(id), local_queues_(local_queues) { } void run(); private: - MpmcQueue &queue_; + MpmcQueue &queue_; MpmcWaiter &waiter_; + size_t id_; + MutableSpan> local_queues_; + size_t cnt_{0}; + + bool try_pop(SchedulerMessage &message, size_t thread_id); + + bool try_pop_local(SchedulerMessage &message); + bool try_pop_global(SchedulerMessage &message, size_t thread_id); }; } // namespace core } // namespace actor diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp index 9569fac360..0863bda0d1 100644 --- a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp +++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/actor/core/Scheduler.h" @@ -24,6 +24,7 @@ namespace td { namespace actor { namespace core { + Scheduler::Scheduler(std::shared_ptr scheduler_group_info, SchedulerId id, size_t cpu_threads_count) : scheduler_group_info_(std::move(scheduler_group_info)), cpu_threads_(cpu_threads_count) { scheduler_group_info_->active_scheduler_count++; @@ -31,17 +32,21 @@ Scheduler::Scheduler(std::shared_ptr scheduler_group_info, S info_->id = id; if (cpu_threads_count != 0) { info_->cpu_threads_count = cpu_threads_count; - info_->cpu_queue = std::make_unique>(1024, max_thread_count()); + info_->cpu_queue = std::make_unique>(1024, max_thread_count()); info_->cpu_queue_waiter = std::make_unique(); + + info_->cpu_local_queue = std::vector>(cpu_threads_count); } info_->io_queue = std::make_unique>(); info_->io_queue->init(); info_->cpu_workers.resize(cpu_threads_count); + td::uint8 cpu_worker_id = 0; for (auto &worker : info_->cpu_workers) { - worker = std::make_unique(WorkerInfo::Type::Cpu, true); + worker = std::make_unique(WorkerInfo::Type::Cpu, true, CpuWorkerId{cpu_worker_id}); + cpu_worker_id++; } - info_->io_worker = std::make_unique(WorkerInfo::Type::Io, !info_->cpu_workers.empty()); + info_->io_worker = std::make_unique(WorkerInfo::Type::Io, !info_->cpu_workers.empty(), CpuWorkerId{}); poll_.init(); io_worker_ = std::make_unique(*info_->io_queue); @@ -62,8 +67,9 @@ Scheduler::~Scheduler() { void Scheduler::start() { for (size_t i = 0; i < cpu_threads_.size(); i++) { cpu_threads_[i] = td::thread([this, i] { - this->run_in_context_impl(*this->info_->cpu_workers[i], - [this] { CpuWorker(*info_->cpu_queue, *info_->cpu_queue_waiter).run(); }); + this->run_in_context_impl(*this->info_->cpu_workers[i], [this, i] { + CpuWorker(*info_->cpu_queue, *info_->cpu_queue_waiter, i, info_->cpu_local_queue).run(); + }); }); cpu_threads_[i].set_name(PSLICE() << "#" << info_->id.value() << ":cpu#" << i); } @@ -121,9 +127,14 @@ void Scheduler::do_stop() { scheduler_group_info_->active_scheduler_count_condition_variable.notify_all(); } -Scheduler::ContextImpl::ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, +Scheduler::ContextImpl::ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, CpuWorkerId cpu_worker_id, SchedulerGroupInfo *scheduler_group, Poll *poll, KHeap *heap) - : creator_(creator), scheduler_id_(scheduler_id), scheduler_group_(scheduler_group), poll_(poll), heap_(heap) { + : creator_(creator) + , scheduler_id_(scheduler_id) + , cpu_worker_id_(cpu_worker_id) + , scheduler_group_(scheduler_group) + , poll_(poll) + , heap_(heap) { } SchedulerId Scheduler::ContextImpl::get_scheduler_id() const { @@ -138,7 +149,18 @@ void Scheduler::ContextImpl::add_to_queue(ActorInfoPtr actor_info_ptr, Scheduler if (need_poll || !info.cpu_queue) { info.io_queue->writer_put(std::move(actor_info_ptr)); } else { - info.cpu_queue->push(std::move(actor_info_ptr), get_thread_id()); + if (scheduler_id == get_scheduler_id() && cpu_worker_id_.is_valid()) { + // may push local + CHECK(actor_info_ptr); + auto raw = actor_info_ptr.release(); + auto should_notify = info.cpu_local_queue[cpu_worker_id_.value()].push( + raw, [&](auto value) { info.cpu_queue->push(value, get_thread_id()); }); + if (should_notify) { + info.cpu_queue_waiter->notify(); + } + return; + } + info.cpu_queue->push(actor_info_ptr.release(), get_thread_id()); info.cpu_queue_waiter->notify(); } } @@ -254,13 +276,26 @@ void Scheduler::close_scheduler_group(SchedulerGroupInfo &group_info) { } // Drain cpu queue + for (auto &q : scheduler_info.cpu_local_queue) { + auto &cpu_queue = q; + while (true) { + SchedulerMessage::Raw *raw_message; + if (!cpu_queue.try_pop(raw_message)) { + break; + } + SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message); + // message's destructor is called + queues_are_empty = false; + } + } if (scheduler_info.cpu_queue) { auto &cpu_queue = *scheduler_info.cpu_queue; while (true) { - SchedulerMessage message; - if (!cpu_queue.try_pop(message, get_thread_id())) { + SchedulerMessage::Raw *raw_message; + if (!cpu_queue.try_pop(raw_message, get_thread_id())) { break; } + SchedulerMessage(SchedulerMessage::acquire_t{}, raw_message); // message's destructor is called queues_are_empty = false; } diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h index 4ebfc91245..3cc627ee45 100644 --- a/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h +++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/Scheduler.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -38,9 +38,11 @@ #include "td/utils/List.h" #include "td/utils/logging.h" #include "td/utils/MpmcQueue.h" +#include "td/utils/StealingQueue.h" #include "td/utils/MpmcWaiter.h" #include "td/utils/MpscLinkQueue.h" #include "td/utils/MpscPollableQueue.h" +#include "td/utils/optional.h" #include "td/utils/port/Poll.h" #include "td/utils/port/detail/Iocp.h" #include "td/utils/port/thread.h" @@ -66,16 +68,52 @@ class IoWorker; struct WorkerInfo { enum class Type { Io, Cpu } type{Type::Io}; WorkerInfo() = default; - explicit WorkerInfo(Type type, bool allow_shared) : type(type), actor_info_creator(allow_shared) { + explicit WorkerInfo(Type type, bool allow_shared, CpuWorkerId cpu_worker_id) + : type(type), actor_info_creator(allow_shared), cpu_worker_id(cpu_worker_id) { } ActorInfoCreator actor_info_creator; + CpuWorkerId cpu_worker_id; +}; + +template +struct LocalQueue { + public: + template + bool push(T value, F &&overflow_f) { + auto res = std::move(next_); + next_ = std::move(value); + if (res) { + queue_.local_push(res.unwrap(), overflow_f); + return true; + } + return false; + } + bool try_pop(T &message) { + if (!next_) { + return queue_.local_pop(message); + } + message = next_.unwrap(); + return true; + } + bool steal(T &message, LocalQueue &other) { + return queue_.steal(message, other.queue_); + } + + private: + td::optional next_; + StealingQueue queue_; + char pad[TD_CONCURRENCY_PAD - sizeof(optional)]; }; struct SchedulerInfo { SchedulerId id; // will be read by all workers is any thread - std::unique_ptr> cpu_queue; + std::unique_ptr> cpu_queue; std::unique_ptr cpu_queue_waiter; + + std::vector> cpu_local_queue; + //std::vector> cpu_stealing_queue; + // only scheduler itself may read from io_queue_ std::unique_ptr> io_queue; size_t cpu_threads_count{0}; @@ -156,11 +194,12 @@ class Scheduler { class ContextImpl : public SchedulerContext { public: - ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, SchedulerGroupInfo *scheduler_group, Poll *poll, - KHeap *heap); + ContextImpl(ActorInfoCreator *creator, SchedulerId scheduler_id, CpuWorkerId cpu_worker_id, + SchedulerGroupInfo *scheduler_group, Poll *poll, KHeap *heap); SchedulerId get_scheduler_id() const override; void add_to_queue(ActorInfoPtr actor_info_ptr, SchedulerId scheduler_id, bool need_poll) override; + ActorInfoCreator &get_actor_info_creator() override; bool has_poll() override; @@ -181,6 +220,7 @@ class Scheduler { ActorInfoCreator *creator_; SchedulerId scheduler_id_; + CpuWorkerId cpu_worker_id_; SchedulerGroupInfo *scheduler_group_; Poll *poll_; @@ -193,8 +233,8 @@ class Scheduler { td::detail::Iocp::Guard iocp_guard(&scheduler_group_info_->iocp); #endif bool is_io_worker = worker_info.type == WorkerInfo::Type::Io; - ContextImpl context(&worker_info.actor_info_creator, info_->id, scheduler_group_info_.get(), - is_io_worker ? &poll_ : nullptr, is_io_worker ? &heap_ : nullptr); + ContextImpl context(&worker_info.actor_info_creator, info_->id, worker_info.cpu_worker_id, + scheduler_group_info_.get(), is_io_worker ? &poll_ : nullptr, is_io_worker ? &heap_ : nullptr); SchedulerContext::Guard guard(&context); f(); } diff --git a/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h b/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h index 124e409276..289adbd475 100644 --- a/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h +++ b/submodules/ton/tonlib-src/tdactor/td/actor/core/SchedulerId.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -26,8 +26,7 @@ namespace actor { namespace core { class SchedulerId { public: - SchedulerId() : id_(-1) { - } + SchedulerId() = default; explicit SchedulerId(uint8 id) : id_(id) { } bool is_valid() const { @@ -42,7 +41,27 @@ class SchedulerId { } private: - int32 id_{0}; + int32 id_{-1}; +}; + +class CpuWorkerId { + public: + CpuWorkerId() = default; + explicit CpuWorkerId(uint8 id) : id_(id) { + } + bool is_valid() const { + return id_ >= 0; + } + uint8 value() const { + CHECK(is_valid()); + return static_cast(id_); + } + bool operator==(CpuWorkerId other) const { + return id_ == other.id_; + } + + private: + int32 id_{-1}; }; } // namespace core } // namespace actor diff --git a/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp b/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp index d426f344b5..1ec9dda249 100644 --- a/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp +++ b/submodules/ton/tonlib-src/tdactor/test/actors_core.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/actor/core/ActorLocker.h" #include "td/actor/actor.h" @@ -101,10 +101,10 @@ TEST(Actor2, locker) { kill_signal.add_signal(ActorSignals::Kill); ActorSignals wakeup_signal; - kill_signal.add_signal(ActorSignals::Wakeup); + wakeup_signal.add_signal(ActorSignals::Wakeup); ActorSignals cpu_signal; - kill_signal.add_signal(ActorSignals::Cpu); + cpu_signal.add_signal(ActorSignals::Cpu); { ActorLocker lockerA(&state); @@ -410,7 +410,7 @@ class Master : public Actor { private: uint32 l = 0; - uint32 r = 100000; + uint32 r = 1000; core::ActorInfoPtr worker; void start_up() override { worker = detail::create_actor(ActorOptions().with_name("Master")); @@ -444,8 +444,8 @@ TEST(Actor2, scheduler_simple) { core::Scheduler scheduler{group_info, SchedulerId{0}, 2}; scheduler.start(); scheduler.run_in_context([] { - global_cnt = 10; - for (int i = 0; i < 10; i++) { + global_cnt = 1000; + for (int i = 0; i < global_cnt; i++) { detail::create_actor(ActorOptions().with_name("Master")); } }); @@ -734,7 +734,7 @@ TEST(Actor2, actor_ping_pong) { return; } auto dest = td::Random::fast(0, (int)next_.size() - 1); - if (td::Random::fast(0, 1) == 0 && 0) { + if (td::Random::fast(0, 1) == 0) { send_closure(next_[dest], &PingPong::query, left - 1, std::move(data)); } else { send_closure_later(next_[dest], &PingPong::query, left - 1, std::move(data)); @@ -755,7 +755,7 @@ TEST(Actor2, actor_ping_pong) { std::shared_ptr watcher_; }; - int N = td::Random::fast(2, 10); + int N = td::Random::fast(2, 100); //N = 2; std::vector> actors; for (int i = 0; i < N; i++) { diff --git a/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h b/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h index f2c261fe67..f2c047138d 100644 --- a/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h +++ b/submodules/ton/tonlib-src/tddb/td/db/MemoryKeyValue.h @@ -38,11 +38,7 @@ class MemoryKeyValue : public KeyValue { std::string stats() const override; private: - class Cmp : public std::less<> { - public: - using is_transparent = void; - }; - std::map map_; + std::map> map_; int64 get_count_{0}; }; } // namespace td diff --git a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp index 16f4b4eb80..47fdf4f5c2 100644 --- a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp +++ b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.cpp @@ -19,6 +19,7 @@ #include "td/db/RocksDb.h" #include "rocksdb/db.h" +#include "rocksdb/table.h" #include "rocksdb/statistics.h" #include "rocksdb/write_batch.h" #include "rocksdb/utilities/optimistic_transaction_db.h" @@ -63,6 +64,13 @@ Result RocksDb::open(std::string path) { auto statistics = rocksdb::CreateDBStatistics(); { rocksdb::Options options; + + static auto cache = rocksdb::NewLRUCache(1 << 30); + + rocksdb::BlockBasedTableOptions table_options; + table_options.block_cache = cache; + options.table_factory.reset(rocksdb::NewBlockBasedTableFactory(table_options)); + options.manual_wal_flush = true; options.create_if_missing = true; options.max_background_compactions = 4; @@ -82,6 +90,10 @@ std::unique_ptr RocksDb::snapshot() { } std::string RocksDb::stats() const { + std::string out; + db_->GetProperty("rocksdb.stats", &out); + //db_->GetProperty("rocksdb.cur-size-all-mem-tables", &out); + return out; return statistics_->ToString(); } diff --git a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h index 04abba778d..77ed46b34b 100644 --- a/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h +++ b/submodules/ton/tonlib-src/tddb/td/db/RocksDb.h @@ -60,6 +60,10 @@ class RocksDb : public KeyValue { RocksDb &operator=(RocksDb &&); ~RocksDb(); + std::shared_ptr raw_db() const { + return db_; + }; + private: std::shared_ptr db_; std::shared_ptr statistics_; diff --git a/submodules/ton/tonlib-src/tddb/test/binlog.cpp b/submodules/ton/tonlib-src/tddb/test/binlog.cpp index fc46157ca6..d2cd35225f 100644 --- a/submodules/ton/tonlib-src/tddb/test/binlog.cpp +++ b/submodules/ton/tonlib-src/tddb/test/binlog.cpp @@ -679,7 +679,7 @@ TEST(Buffers, CyclicBufferSimple) { auto data = td::rand_string('a', 'z', 100001); td::Slice write_slice = data; td::Slice read_slice = data; - for (size_t i = 1; (int)i < options.count; i++) { + for (size_t i = 1; i < options.count; i++) { ASSERT_EQ((i - 1) * options.chunk_size, reader.reader_size()); ASSERT_EQ((i - 1) * options.chunk_size, writer.writer_size()); auto slice = writer.prepare_write(); diff --git a/submodules/ton/tonlib-src/tddb/test/key_value.cpp b/submodules/ton/tonlib-src/tddb/test/key_value.cpp index 550ccd2fad..cf147e5721 100644 --- a/submodules/ton/tonlib-src/tddb/test/key_value.cpp +++ b/submodules/ton/tonlib-src/tddb/test/key_value.cpp @@ -170,7 +170,11 @@ TEST(KeyValue, Bench) { TEST(KeyValue, Stress) { return; td::Slice db_name = "testdb"; - td::RocksDb::destroy(db_name).ignore(); + size_t N = 20; + auto db_name_i = [&](size_t i) { return PSTRING() << db_name << i; }; + for (size_t i = 0; i < N; i++) { + td::RocksDb::destroy(db_name_i(i)).ignore(); + } td::actor::Scheduler scheduler({6}); auto watcher = td::create_shared_destructor([] { td::actor::SchedulerContext::get()->stop(); }); @@ -186,9 +190,13 @@ TEST(KeyValue, Stress) { void tear_down() override { } void loop() override { + if (stat_at_.is_in_past()) { + stat_at_ = td::Timestamp::in(10); + LOG(ERROR) << db_->stats(); + } if (!kv_) { - kv_ = td::KeyValueAsync( - std::make_unique(td::RocksDb::open(db_name_).move_as_ok())); + db_ = std::make_shared(td::RocksDb::open(db_name_).move_as_ok()); + kv_ = td::KeyValueAsync(db_); set_start_at_ = td::Timestamp::now(); } if (next_set_ && next_set_.is_in_past()) { @@ -207,6 +215,7 @@ TEST(KeyValue, Stress) { private: std::shared_ptr watcher_; + std::shared_ptr db_; td::optional> kv_; std::string db_name_; int left_cnt_ = 1000000000; @@ -214,6 +223,7 @@ TEST(KeyValue, Stress) { td::Timestamp next_set_ = td::Timestamp::now(); td::Timestamp set_start_at_; td::Timestamp set_finish_at_; + td::Timestamp stat_at_ = td::Timestamp::in(10); void do_set() { td::UInt128 key = td::UInt128::zero(); @@ -236,8 +246,10 @@ TEST(KeyValue, Stress) { } } }; - scheduler.run_in_context([watcher = std::move(watcher), &db_name]() mutable { - td::actor::create_actor("Worker", watcher, db_name.str()).release(); + scheduler.run_in_context([watcher = std::move(watcher), &db_name_i, &N]() mutable { + for (size_t i = 0; i < N; i++) { + td::actor::create_actor("Worker", watcher, db_name_i(i)).release(); + } watcher.reset(); }); diff --git a/submodules/ton/tonlib-src/tdutils/CMakeLists.txt b/submodules/ton/tonlib-src/tdutils/CMakeLists.txt index ed82dbb12f..721a32b7d1 100644 --- a/submodules/ton/tonlib-src/tdutils/CMakeLists.txt +++ b/submodules/ton/tonlib-src/tdutils/CMakeLists.txt @@ -56,6 +56,7 @@ set(TDUTILS_SOURCE td/utils/port/MemoryMapping.cpp td/utils/port/path.cpp td/utils/port/PollFlags.cpp + td/utils/port/rlimit.cpp td/utils/port/ServerSocketFd.cpp td/utils/port/signals.cpp td/utils/port/sleep.cpp @@ -129,6 +130,7 @@ set(TDUTILS_SOURCE td/utils/port/Poll.h td/utils/port/PollBase.h td/utils/port/PollFlags.h + td/utils/port/rlimit.h td/utils/port/RwMutex.h td/utils/port/ServerSocketFd.h td/utils/port/signals.h @@ -228,6 +230,7 @@ set(TDUTILS_SOURCE td/utils/SpinLock.h td/utils/StackAllocator.h td/utils/Status.h + td/utils/StealingQueue.h td/utils/Storer.h td/utils/StorerBase.h td/utils/StringBuilder.h @@ -279,6 +282,7 @@ set(TDUTILS_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/pq.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test/SharedObjectPool.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test/SharedSlice.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/test/StealingQueue.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test/variant.cpp PARENT_SCOPE ) diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h b/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h index 8dff309144..9940eb1e7b 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/BufferedFd.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -84,6 +84,12 @@ class BufferedFd : public BufferedFdBase { ~BufferedFd(); void close(); + size_t left_unread() { + return input_reader_.size(); + } + size_t left_unwritten() { + return output_reader_.size(); + } Result flush_read(size_t max_read = std::numeric_limits::max()) TD_WARN_UNUSED_RESULT; Result flush_write() TD_WARN_UNUSED_RESULT; diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp index 49a0a6276d..7f36deed83 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp +++ b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/FileLog.h" @@ -128,4 +128,10 @@ void FileLog::do_rotate() { SET_VERBOSITY_LEVEL(current_verbosity_level); } +Result> FileLog::create(string path, int64 rotate_threshold, bool redirect_stderr) { + auto l = make_unique(); + TRY_STATUS(l->init(std::move(path), rotate_threshold, redirect_stderr)); + return std::move(l); +} + } // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h index 63708c16aa..2cead1be5a 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/FileLog.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -30,6 +30,8 @@ class FileLog : public LogInterface { static constexpr int64 DEFAULT_ROTATE_THRESHOLD = 10 * (1 << 20); public: + static Result> create(string path, int64 rotate_threshold = DEFAULT_ROTATE_THRESHOLD, + bool redirect_stderr = true); Status init(string path, int64 rotate_threshold = DEFAULT_ROTATE_THRESHOLD, bool redirect_stderr = true); Slice get_path() const; diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h index 2daf61472b..e6504e358c 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcQueue.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -117,24 +117,28 @@ template class OneValue { public: bool set_value(T *value) { - T *was = nullptr; + T *was = Empty(); return state_.compare_exchange_strong(was, value, std::memory_order_acq_rel); } bool get_value(T *&value) { value = state_.exchange(Taken(), std::memory_order_acq_rel); - return value != nullptr; + return value != Empty(); } void reset() { - state_ = nullptr; + state_ = Empty(); } OneValue() { } private: - std::atomic state_{nullptr}; - T *Taken() { - static T xxx; - return &xxx; + std::atomic state_{Empty()}; + static T *Empty() { + static int64 xxx; + return reinterpret_cast(&xxx); + } + static T *Taken() { + static int64 xxx; + return reinterpret_cast(&xxx); } }; diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h index 42864cae56..8fb1a5111e 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/MpmcWaiter.h @@ -14,63 +14,86 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "td/utils/common.h" +#include "td/utils/logging.h" #include "td/utils/port/thread.h" #include +#include #include #include namespace td { -class MpmcWaiter { +class MpmcEagerWaiter { public: - int wait(int yields, uint32 worker_id) { - if (yields < RoundsTillSleepy) { + struct Slot { + private: + friend class MpmcEagerWaiter; + int yields; + uint32 worker_id; + }; + void init_slot(Slot &slot, uint32 worker_id) { + slot.yields = 0; + slot.worker_id = worker_id; + } + void wait(Slot &slot) { + if (slot.yields < RoundsTillSleepy) { td::this_thread::yield(); - return yields + 1; - } else if (yields == RoundsTillSleepy) { + slot.yields++; + return; + } else if (slot.yields == RoundsTillSleepy) { auto state = state_.load(std::memory_order_relaxed); if (!State::has_worker(state)) { - auto new_state = State::with_worker(state, worker_id); + auto new_state = State::with_worker(state, slot.worker_id); if (state_.compare_exchange_strong(state, new_state, std::memory_order_acq_rel)) { td::this_thread::yield(); - return yields + 1; + slot.yields++; + return; } if (state == State::awake()) { - return 0; + slot.yields = 0; + return; } } td::this_thread::yield(); - return 0; - } else if (yields < RoundsTillAsleep) { + slot.yields = 0; + return; + } else if (slot.yields < RoundsTillAsleep) { auto state = state_.load(std::memory_order_acquire); - if (State::still_sleepy(state, worker_id)) { + if (State::still_sleepy(state, slot.worker_id)) { td::this_thread::yield(); - return yields + 1; + slot.yields++; + return; } - return 0; + slot.yields = 0; + return; } else { auto state = state_.load(std::memory_order_acquire); - if (State::still_sleepy(state, worker_id)) { + if (State::still_sleepy(state, slot.worker_id)) { std::unique_lock lock(mutex_); if (state_.compare_exchange_strong(state, State::asleep(), std::memory_order_acq_rel)) { condition_variable_.wait(lock); } } - return 0; + slot.yields = 0; + return; } } - int stop_wait(int yields, uint32 worker_id) { - if (yields > RoundsTillSleepy) { + void stop_wait(Slot &slot) { + if (slot.yields > RoundsTillSleepy) { notify_cold(); } - return 0; + slot.yields = 0; + return; + } + + void close() { } void notify() { @@ -102,8 +125,8 @@ class MpmcWaiter { return (state >> 1) == (worker + 1); } }; - //enum { RoundsTillSleepy = 32, RoundsTillAsleep = 64 }; - enum { RoundsTillSleepy = 1, RoundsTillAsleep = 2 }; + enum { RoundsTillSleepy = 32, RoundsTillAsleep = 64 }; + // enum { RoundsTillSleepy = 1, RoundsTillAsleep = 2 }; std::atomic state_{State::awake()}; std::mutex mutex_; std::condition_variable condition_variable_; @@ -117,4 +140,208 @@ class MpmcWaiter { } }; +class MpmcSleepyWaiter { + public: + struct Slot { + private: + friend class MpmcSleepyWaiter; + + enum State { Search, Work, Sleep } state_{Work}; + + void park() { + std::unique_lock guard(mutex_); + condition_variable_.wait(guard, [&] { return unpark_flag_; }); + unpark_flag_ = false; + } + + bool cancel_park() { + auto res = unpark_flag_; + unpark_flag_ = false; + return res; + } + + void unpark() { + //TODO: try unlock guard before notify_all + std::unique_lock guard(mutex_); + unpark_flag_ = true; + condition_variable_.notify_all(); + } + + std::mutex mutex_; + std::condition_variable condition_variable_; + bool unpark_flag_{false}; // TODO: move out of lock + int yield_cnt{0}; + int32 worker_id{0}; + char padding[128]; + }; + + // There are a lot of workers + // Each has a slot + // + // States of a worker: + // - searching for work | Search + // - processing work | Work + // - sleeping | Sleep + // + // When somebody adds a work it calls notify + // + // notify + // if there are workers in search phase do nothing. + // if all workers are awake do nothing + // otherwise wake some random worker + // + // Initially all workers are in Search mode. + // + // When worker found nothing it may try to call wait. + // This may put it in a Sleep for some time. + // After wait return worker will be in Search state again. + // + // Suppose worker found a work and ready to process it. + // Than it may call stop_wait. This will cause transition from + // Search to Work state. + // + // Main invariant: + // After notify is called there should be at least on worker in Search or Work state. + // If possible - in Search state + // + + void init_slot(Slot &slot, int32 worker_id) { + slot.state_ = Slot::State::Work; + slot.unpark_flag_ = false; + slot.worker_id = worker_id; + VLOG(waiter) << "Init slot " << worker_id; + } + + int VERBOSITY_NAME(waiter) = VERBOSITY_NAME(DEBUG) + 10; + void wait(Slot &slot) { + if (slot.state_ == Slot::State::Work) { + VLOG(waiter) << "Work -> Search"; + state_++; + slot.state_ = Slot::State::Search; + slot.yield_cnt = 0; + return; + } + if (slot.state_ == Slot::Search) { + if (slot.yield_cnt++ < 10 && false) { + td::this_thread::yield(); + return; + } + + slot.state_ = Slot::State::Sleep; + std::unique_lock guard(sleepers_mutex_); + auto state_view = StateView(state_.fetch_add((1 << PARKING_SHIFT) - 1)); + CHECK(state_view.searching_count != 0); + bool should_search = state_view.searching_count == 1; + if (closed_) { + return; + } + sleepers_.push_back(&slot); + LOG_CHECK(slot.unpark_flag_ == false) << slot.worker_id; + VLOG(waiter) << "add to sleepers " << slot.worker_id; + //guard.unlock(); + if (should_search) { + VLOG(waiter) << "Search -> Search once then Sleep "; + return; + } + VLOG(waiter) << "Search -> Sleep " << state_view.searching_count << " " << state_view.parked_count; + } + + CHECK(slot.state_ == Slot::State::Sleep); + VLOG(waiter) << "Park " << slot.worker_id; + slot.park(); + VLOG(waiter) << "Resume " << slot.worker_id; + slot.state_ = Slot::State::Search; + slot.yield_cnt = 0; + } + + void stop_wait(Slot &slot) { + if (slot.state_ == Slot::State::Work) { + return; + } + if (slot.state_ == Slot::State::Sleep) { + VLOG(waiter) << "Search once then Sleep -> Work/Search " << slot.worker_id; + slot.state_ = Slot::State::Work; + std::unique_lock guard(sleepers_mutex_); + auto it = std::find(sleepers_.begin(), sleepers_.end(), &slot); + if (it != sleepers_.end()) { + sleepers_.erase(it); + VLOG(waiter) << "remove from sleepers " << slot.worker_id; + state_.fetch_sub((1 << PARKING_SHIFT) - 1); + guard.unlock(); + } else { + guard.unlock(); + VLOG(waiter) << "not in sleepers" << slot.worker_id; + CHECK(slot.cancel_park()); + } + } + VLOG(waiter) << "Search once then Sleep -> Work " << slot.worker_id; + slot.state_ = Slot::State::Search; + auto state_view = StateView(state_.fetch_sub(1)); + CHECK(state_view.searching_count != 0); + CHECK(state_view.searching_count < 1000); + bool should_notify = state_view.searching_count == 1; + if (should_notify) { + VLOG(waiter) << "Notify others"; + notify(); + } + VLOG(waiter) << "Search -> Work "; + slot.state_ = Slot::State::Work; + } + + void notify() { + auto view = StateView(state_.load()); + //LOG(ERROR) << view.parked_count; + if (view.searching_count > 0 || view.parked_count == 0) { + VLOG(waiter) << "Ingore notify: " << view.searching_count << " " << view.parked_count; + return; + } + + VLOG(waiter) << "Notify: " << view.searching_count << " " << view.parked_count; + std::unique_lock guard(sleepers_mutex_); + + view = StateView(state_.load()); + if (view.searching_count > 0) { + VLOG(waiter) << "Skip notify: got searching"; + return; + } + + CHECK(view.parked_count == static_cast(sleepers_.size())); + if (sleepers_.empty()) { + VLOG(waiter) << "Skip notify: no sleepers"; + return; + } + + auto sleeper = sleepers_.back(); + sleepers_.pop_back(); + state_.fetch_sub((1 << PARKING_SHIFT) - 1); + VLOG(waiter) << "Unpark " << sleeper->worker_id; + sleeper->unpark(); + } + + void close() { + StateView state(state_.load()); + LOG_CHECK(state.parked_count == 0) << state.parked_count; + LOG_CHECK(state.searching_count == 0) << state.searching_count; + } + + private: + static constexpr td::int32 PARKING_SHIFT = 16; + struct StateView { + td::int32 parked_count; + td::int32 searching_count; + explicit StateView(int32 x) { + parked_count = x >> PARKING_SHIFT; + searching_count = x & ((1 << PARKING_SHIFT) - 1); + } + }; + std::atomic state_{0}; + + std::mutex sleepers_mutex_; + std::vector sleepers_; + + bool closed_ = false; +}; + +using MpmcWaiter = MpmcSleepyWaiter; + } // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h b/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h index 5f60614246..0a9123d317 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/SharedObjectPool.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -49,9 +49,7 @@ class AtomicRefCnt { }; template -class SharedPtrRaw - : public DeleterT - , private MpscLinkQueueImpl::Node { +class SharedPtrRaw : public DeleterT, private MpscLinkQueueImpl::Node { public: explicit SharedPtrRaw(DeleterT deleter) : DeleterT(std::move(deleter)), ref_cnt_{0}, option_magic_(Magic) { } @@ -100,6 +98,7 @@ template > class SharedPtr { public: using Raw = detail::SharedPtrRaw; + struct acquire_t {}; SharedPtr() = default; ~SharedPtr() { if (!raw_) { @@ -112,6 +111,8 @@ class SharedPtr { raw_->inc(); } } + SharedPtr(acquire_t, Raw *raw) : raw_(raw) { + } SharedPtr(const SharedPtr &other) : SharedPtr(other.raw_) { } SharedPtr &operator=(const SharedPtr &other) { diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/Span.h b/submodules/ton/tonlib-src/tdutils/td/utils/Span.h index 8c8ee110b5..a4a8edffa3 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/Span.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/Span.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -95,6 +95,12 @@ class SpanImpl { InnerT *end() const { return data_ + size_; } + auto rbegin() const { + return std::reverse_iterator(end()); + } + auto rend() const { + return std::reverse_iterator(begin()); + } size_t size() const { return size_; } diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/Status.h b/submodules/ton/tonlib-src/tdutils/td/utils/Status.h index 6ac9210059..8016099fa7 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/Status.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/Status.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -64,6 +64,9 @@ #define TRY_RESULT_ASSIGN(name, result) TRY_RESULT_IMPL(TD_CONCAT(TD_CONCAT(r_, name), __LINE__), name, result) +#define TRY_RESULT_PROMISE_ASSIGN(promise_name, name, result) \ + TRY_RESULT_PROMISE_IMPL(promise_name, TD_CONCAT(TD_CONCAT(r_, name), __LINE__), name, result) + #define TRY_RESULT_PREFIX(name, result, prefix) \ TRY_RESULT_PREFIX_IMPL(TD_CONCAT(TD_CONCAT(r_, name), __LINE__), auto name, result, prefix) diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/StealingQueue.h b/submodules/ton/tonlib-src/tdutils/td/utils/StealingQueue.h new file mode 100644 index 0000000000..20a39dc060 --- /dev/null +++ b/submodules/ton/tonlib-src/tdutils/td/utils/StealingQueue.h @@ -0,0 +1,124 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ +#pragma once + +#include "td/utils/Status.h" +#include "td/utils/Span.h" +namespace td { +template +class StealingQueue { + public: + // tries to put a value + // returns if succeeded + // only owner is alowed to to do this + template + void local_push(T value, F&& overflow_f) { + while (true) { + auto tail = tail_.load(std::memory_order_relaxed); + auto head = head_.load(); //TODO: memory order + + if (static_cast(tail - head) < N) { + buf_[tail & MASK].store(value, std::memory_order_relaxed); + tail_.store(tail + 1, std::memory_order_release); + return; + } + + // queue is full + // TODO: batch insert into global queue? + auto n = N / 2 + 1; + auto new_head = head + n; + if (!head_.compare_exchange_strong(head, new_head)) { + continue; + } + + for (size_t i = 0; i < n; i++) { + overflow_f(buf_[(i + head) & MASK].load(std::memory_order_relaxed)); + } + overflow_f(value); + + return; + } + } + + // tries to pop a value + // returns if succeeded + // only owner is alowed to to do this + bool local_pop(T& value) { + auto tail = tail_.load(std::memory_order_relaxed); + auto head = head_.load(); + + if (head == tail) { + return false; + } + + value = buf_[head & MASK].load(std::memory_order_relaxed); + return head_.compare_exchange_strong(head, head + 1); + } + + bool steal(T& value, StealingQueue& other) { + while (true) { + auto tail = tail_.load(std::memory_order_relaxed); + auto head = head_.load(); //TODO: memory order + + auto other_head = other.head_.load(); + auto other_tail = other.tail_.load(std::memory_order_acquire); + + if (other_tail < other_head) { + continue; + } + size_t n = other_tail - other_head; + if (n > N) { + continue; + } + n -= n / 2; + n = td::min(n, static_cast(head + N - tail)); + if (n == 0) { + return false; + } + + for (size_t i = 0; i < n; i++) { + buf_[(i + tail) & MASK].store(other.buf_[(i + other_head) & MASK].load(std::memory_order_relaxed), + std::memory_order_relaxed); + } + + if (!other.head_.compare_exchange_strong(other_head, other_head + n)) { + continue; + } + + n--; + value = buf_[(tail + n) & MASK].load(std::memory_order_relaxed); + tail_.store(tail + n, std::memory_order_release); + return true; + } + } + + StealingQueue() { + for (auto& x : buf_) { + x.store(T{}, std::memory_order_relaxed); + } + std::atomic_thread_fence(std::memory_order_seq_cst); + } + + private: + std::atomic head_{0}; + std::atomic tail_{0}; + static constexpr size_t MASK{N - 1}; + std::array, N> buf_; +}; +}; // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h b/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h index 229b967e80..5fe1e94219 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/StringBuilder.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp index e36b4fc50d..865faa4b46 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp +++ b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "TsFileLog.h" @@ -24,8 +24,10 @@ namespace td { namespace detail { class TsFileLog : public LogInterface { public: - Status init(string path) { + Status init(string path, td::int64 rotate_threshold, bool redirect_stderr) { path_ = std::move(path); + rotate_threshold_ = rotate_threshold; + redirect_stderr_ = redirect_stderr; for (int i = 0; i < (int)logs_.size(); i++) { logs_[i].id = i; } @@ -54,6 +56,8 @@ class TsFileLog : public LogInterface { int id; }; static constexpr int MAX_THREAD_ID = 128; + td::int64 rotate_threshold_; + bool redirect_stderr_; std::string path_; std::array logs_; @@ -70,7 +74,7 @@ class TsFileLog : public LogInterface { } Status init_info(Info *info) { - TRY_STATUS(info->log.init(get_path(info), std::numeric_limits::max(), info->id == 0)); + TRY_STATUS(info->log.init(get_path(info), std::numeric_limits::max(), info->id == 0 && redirect_stderr_)); info->is_inited = true; return Status::OK(); } @@ -92,9 +96,9 @@ class TsFileLog : public LogInterface { }; } // namespace detail -Result> TsFileLog::create(string path) { +Result> TsFileLog::create(string path, td::int64 rotate_threshold, bool redirect_stderr) { auto res = td::make_unique(); - TRY_STATUS(res->init(path)); + TRY_STATUS(res->init(path, rotate_threshold, redirect_stderr)); return std::move(res); } } // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h index a34572af51..0ebac8ebff 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/TsFileLog.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -22,7 +22,10 @@ namespace td { class TsFileLog { + static constexpr int64 DEFAULT_ROTATE_THRESHOLD = 10 * (1 << 20); + public: - static Result> create(string path); + static Result> create(string path, int64 rotate_threshold = DEFAULT_ROTATE_THRESHOLD, + bool redirect_stderr = true); }; } // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h b/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h index 30777a164a..708fc1cb66 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/Variant.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -253,6 +253,10 @@ class Variant { return offset_; } + bool empty() const { + return offset_ == npos; + } + private: union { int64 align_; diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp index 67874d2141..356b3af388 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp +++ b/submodules/ton/tonlib-src/tdutils/td/utils/base64.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/base64.h" @@ -30,6 +30,68 @@ namespace td { //TODO: fix copypaste +static const char *const symbols32_lc = "abcdefghijklmnopqrstuvwxyz234567"; +static const char *const symbols32_uc = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"; + +string base32_encode(Slice input, bool upper_case) { + auto *symbols32 = (upper_case ? symbols32_uc : symbols32_lc); + string base32; + base32.reserve((input.size() * 8 + 4) / 5); + uint32 c = 0; + uint32 length = 0; + for (size_t i = 0; i < input.size(); i++) { + c = (c << 8) | input.ubegin()[i]; + length += 8; + while (length >= 5) { + length -= 5; + base32.push_back(symbols32[(c >> length) & 31]); + } + } + if (length != 0) { + base32.push_back(symbols32[(c << (5 - length)) & 31]); + } + //TODO: optional padding + return base32; +} + +static unsigned char b32_char_to_value[256]; +static void init_base32_table() { + static bool is_inited = [] { + std::fill(std::begin(b32_char_to_value), std::end(b32_char_to_value), static_cast(32)); + for (unsigned char i = 0; i < 32; i++) { + b32_char_to_value[static_cast(symbols32_lc[i])] = i; + b32_char_to_value[static_cast(symbols32_uc[i])] = i; + } + return true; + }(); + CHECK(is_inited); +} + +Result base32_decode(Slice base32) { + init_base32_table(); + string res; + res.reserve(base32.size() * 5 / 8); + uint32 c = 0; + uint32 length = 0; + for (size_t i = 0; i < base32.size(); i++) { + auto value = b32_char_to_value[base32.ubegin()[i]]; + if (value == 32) { + return Status::Error("Wrong character in the string"); + } + c = (c << 5) | value; + length += 5; + while (length >= 8) { + length -= 8; + res.push_back(td::uint8((c >> length) & 255)); + } + } + if ((c & ((1 << length) - 1)) != 0) { + return Status::Error("Nonzero padding"); + } + //TODO: check padding + return res; +} + static const char *const symbols64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; string base64_encode(Slice input) { diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/base64.h b/submodules/ton/tonlib-src/tdutils/td/utils/base64.h index f17cf3eb7c..bf46a83541 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/base64.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/base64.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -37,4 +37,7 @@ bool is_base64url(Slice input); string base64_filter(Slice input); +string base32_encode(Slice input, bool upper_case = false); +Result base32_decode(Slice base32); + } // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/bits.h b/submodules/ton/tonlib-src/tdutils/td/utils/bits.h index d4ab932e31..1197b9db23 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/bits.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/bits.h @@ -139,7 +139,13 @@ inline uint64 bswap64(uint64 x) { } inline int32 count_bits32(uint32 x) { - return __popcnt(x); + // Do not use __popcnt because it will fail on some platforms. + x -= (x >> 1) & 0x55555555; + x = (x & 0x33333333) + ((x >> 2) & 0x33333333); + x = (x + (x >> 4)) & 0x0F0F0F0F; + x += x >> 8; + return (x + (x >> 16)) & 0x3F; + //return __popcnt(x); } inline int32 count_bits64(uint64 x) { diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/misc.h b/submodules/ton/tonlib-src/tdutils/td/utils/misc.h index d747313eb8..ceba11daae 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/misc.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/misc.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -44,12 +44,12 @@ std::pair split(T s, char delimiter = ' ') { } template -vector full_split(T s, char delimiter = ' ') { +vector full_split(T s, char delimiter = ' ', size_t max_parts = std::numeric_limits::max()) { vector result; if (s.empty()) { return result; } - while (true) { + while (result.size() + 1 < max_parts) { auto delimiter_pos = s.find(delimiter); if (delimiter_pos == string::npos) { result.push_back(std::move(s)); @@ -59,6 +59,8 @@ vector full_split(T s, char delimiter = ' ') { s = s.substr(delimiter_pos + 1); } } + result.push_back(std::move(s)); + return result; } string implode(const vector &v, char delimiter = ' '); @@ -301,6 +303,20 @@ typename std::enable_if::value, T>::type hex_to_integer(Slic return integer_value; } +template +Result::value, T>::type> hex_to_integer_safe(Slice str) { + T integer_value = 0; + auto begin = str.begin(); + auto end = str.end(); + while (begin != end) { + if (!is_hex_digit(*begin)) { + return Status::Error("not a hex digit"); + } + integer_value = static_cast(integer_value * 16 + hex_to_int(*begin++)); + } + return integer_value; +} + double to_double(Slice str); template diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/optional.h b/submodules/ton/tonlib-src/tdutils/td/utils/optional.h index 7da14b6294..3eb2d51822 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/optional.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/optional.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -74,6 +74,13 @@ class optional { return res; } + td::optional copy() const { + if (*this) { + return value(); + } + return {}; + } + template void emplace(ArgsT &&... args) { impl_.emplace(std::forward(args)...); diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp index e72b39143d..ca89db4c8a 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp +++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/detail/Epoll.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/port/detail/Epoll.h" @@ -109,6 +109,7 @@ void Epoll::run(int timeout_ms) { #ifdef EPOLLRDHUP if (event->events & EPOLLRDHUP) { event->events &= ~EPOLLRDHUP; + flags = flags | PollFlags::Close(); // flags |= Fd::Close; // TODO } diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.cpp new file mode 100644 index 0000000000..5833961c89 --- /dev/null +++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.cpp @@ -0,0 +1,102 @@ +/* + 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 . + + Copyright 2019-2020 Telegram Systems LLP +*/ +#include "rlimit.h" +#if TD_LINUX || TD_ANDROID +#include +#include +#include +#include +#endif + +namespace td { + +#if TD_PORT_POSIX + +namespace { + +int get_rlimit_type(RlimitType rlim_type) { + switch (rlim_type) { + case RlimitType::nofile: + return RLIMIT_NOFILE; + case RlimitType::rss: + return RLIMIT_RSS; + default: + UNREACHABLE(); + } +} + +} // namespace + +td::Status change_rlimit(RlimitType rlim_type, td::uint64 value, td::uint64 cap) { + if (cap && value > cap) { + return td::Status::Error("setrlimit(): bad argument"); + } + int resource = get_rlimit_type(rlim_type); + + struct rlimit r; + if (getrlimit(resource, &r) < 0) { + return td::Status::PosixError(errno, "failed getrlimit()"); + } + + if (cap) { + r.rlim_max = cap; + } else if (r.rlim_max < value) { + r.rlim_max = value; + } + r.rlim_cur = value; + if (setrlimit(resource, &r) < 0) { + return td::Status::PosixError(errno, "failed setrlimit()"); + } + return td::Status::OK(); +} + +td::Status change_maximize_rlimit(RlimitType rlim_type, td::uint64 value) { + int resource = get_rlimit_type(rlim_type); + + struct rlimit r; + if (getrlimit(resource, &r) < 0) { + return td::Status::PosixError(errno, "failed getrlimit()"); + } + + if (r.rlim_max < value) { + auto t = r; + t.rlim_cur = value; + t.rlim_max = value; + if (setrlimit(resource, &t) >= 0) { + return td::Status::OK(); + } + } + + r.rlim_cur = value < r.rlim_max ? value : r.rlim_max; + if (setrlimit(resource, &r) < 0) { + return td::Status::PosixError(errno, "failed setrlimit()"); + } + return td::Status::OK(); +} +#else +td::Status change_rlimit(RlimitType rlim, td::uint64 value) { + return td::Status::Error("setrlimit not implemented on WINDOWS"); +} +td::Status change_maximize_rlimit(RlimitType rlim, td::uint64 value) { + return td::Status::OK(); +} +#endif + +} // namespace td + diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.h b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.h new file mode 100644 index 0000000000..9f6a652463 --- /dev/null +++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/rlimit.h @@ -0,0 +1,32 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ +#pragma once + +#include "td/utils/port/config.h" +#include "td/utils/port/platform.h" +#include "td/utils/Status.h" + +namespace td { + +enum class RlimitType { nofile, rss }; + +td::Status change_rlimit(RlimitType rlim_type, td::uint64 value, td::uint64 cap = 0); +td::Status change_maximize_rlimit(RlimitType rlim, td::uint64 value); + +} // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp index 859bb70311..2e77eff87f 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp +++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.cpp @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #include "user.h" #if TD_LINUX #include diff --git a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h index 4c5d48a457..9c53c2fc2c 100644 --- a/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h +++ b/submodules/ton/tonlib-src/tdutils/td/utils/port/user.h @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #pragma once #include "td/utils/port/config.h" diff --git a/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp b/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp index cf75b5252d..9cb5b3635b 100644 --- a/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp +++ b/submodules/ton/tonlib-src/tdutils/test/MpmcWaiter.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/MpmcWaiter.h" #include "td/utils/port/sleep.h" @@ -25,21 +25,22 @@ #include #if !TD_THREAD_UNSUPPORTED -TEST(MpmcWaiter, stress_one_one) { +template +void test_waiter_stress_one_one() { td::Stage run; td::Stage check; std::vector threads; std::atomic value{0}; size_t write_cnt = 10; - td::unique_ptr waiter; + td::unique_ptr waiter; size_t threads_n = 2; for (size_t i = 0; i < threads_n; i++) { threads.push_back(td::thread([&, id = static_cast(i)] { for (td::uint64 round = 1; round < 100000; round++) { if (id == 0) { value = 0; - waiter = td::make_unique(); + waiter = td::make_unique(); write_cnt = td::Random::fast(1, 10); } run.wait(round * threads_n); @@ -49,17 +50,19 @@ TEST(MpmcWaiter, stress_one_one) { waiter->notify(); } } else { - int yields = 0; + typename W::Slot slot; + waiter->init_slot(slot, id); for (size_t i = 1; i <= write_cnt; i++) { while (true) { auto x = value.load(std::memory_order_relaxed); if (x >= i) { break; } - yields = waiter->wait(yields, id); + waiter->wait(slot); } - yields = waiter->stop_wait(yields, id); + waiter->stop_wait(slot); } + waiter->stop_wait(slot); } check.wait(round * threads_n); } @@ -69,7 +72,15 @@ TEST(MpmcWaiter, stress_one_one) { thread.join(); } } -TEST(MpmcWaiter, stress) { +TEST(MpmcEagerWaiter, stress_one_one) { + test_waiter_stress_one_one(); +} +TEST(MpmcSleepyWaiter, stress_one_one) { + test_waiter_stress_one_one(); +} + +template +void test_waiter_stress() { td::Stage run; td::Stage check; @@ -81,7 +92,7 @@ TEST(MpmcWaiter, stress) { size_t end_pos; size_t write_cnt; size_t threads_n = 20; - td::unique_ptr waiter; + td::unique_ptr waiter; for (size_t i = 0; i < threads_n; i++) { threads.push_back(td::thread([&, id = static_cast(i)] { for (td::uint64 round = 1; round < 1000; round++) { @@ -92,7 +103,7 @@ TEST(MpmcWaiter, stress) { end_pos = write_n * write_cnt; write_pos = 0; read_pos = 0; - waiter = td::make_unique(); + waiter = td::make_unique(); } run.wait(round * threads_n); if (id <= write_n) { @@ -104,21 +115,26 @@ TEST(MpmcWaiter, stress) { waiter->notify(); } } else if (id > 10 && id - 10 <= read_n) { - int yields = 0; + typename W::Slot slot; + waiter->init_slot(slot, id); while (true) { auto x = read_pos.load(std::memory_order_relaxed); if (x == end_pos) { + waiter->stop_wait(slot); break; } if (x == write_pos.load(std::memory_order_relaxed)) { - yields = waiter->wait(yields, id); + waiter->wait(slot); continue; } - yields = waiter->stop_wait(yields, id); + waiter->stop_wait(slot); read_pos.compare_exchange_strong(x, x + 1, std::memory_order_relaxed); } } check.wait(round * threads_n); + if (id == 0) { + waiter->close(); + } } })); } @@ -126,4 +142,10 @@ TEST(MpmcWaiter, stress) { thread.join(); } } +TEST(MpmcEagerWaiter, stress_multi) { + test_waiter_stress(); +} +TEST(MpmcSleepyWaiter, stress_multi) { + test_waiter_stress(); +} #endif // !TD_THREAD_UNSUPPORTED diff --git a/submodules/ton/tonlib-src/tdutils/test/StealingQueue.cpp b/submodules/ton/tonlib-src/tdutils/test/StealingQueue.cpp new file mode 100644 index 0000000000..6aa2aae6ba --- /dev/null +++ b/submodules/ton/tonlib-src/tdutils/test/StealingQueue.cpp @@ -0,0 +1,153 @@ +/* + This file is part of TON Blockchain source code. + + TON Blockchain is free software; you can redistribute it and/or + modify it under the terms of the GNU 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 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with TON Blockchain. If not, see . + + In addition, as a special exception, the copyright holders give permission + to link the code of portions of this program with the OpenSSL library. + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the file(s), + but you are not obligated to do so. If you do not wish to do so, delete this + exception statement from your version. If you delete this exception statement + from all source files in the program, then also delete it here. + + Copyright 2019-2020 Telegram Systems LLP +*/ +#include "td/utils/tests.h" +#include "td/utils/benchmark.h" + +#include "td/utils/StealingQueue.h" +#include "td/utils/MpmcQueue.h" + +namespace td { +TEST(StealingQueue, very_simple) { + StealingQueue q; + q.local_push(1, [](auto x) { UNREACHABLE(); }); + int x; + CHECK(q.local_pop(x)); + ASSERT_EQ(1, x); +} +TEST(AtomicRead, simple) { + td::Stage run; + td::Stage check; + + size_t threads_n = 10; + std::vector threads; + + int x{0}; + std::atomic version{0}; + + int64 res = 0; + for (size_t i = 0; i < threads_n; i++) { + threads.push_back(td::thread([&, id = static_cast(i)] { + for (uint64 round = 1; round < 10000; round++) { + if (id == 0) { + } + run.wait(round * threads_n); + if (id == 0) { + version++; + x++; + version++; + } else { + int y = 0; + auto v1 = version.load(); + y = x; + auto v2 = version.load(); + if (v1 == v2 && v1 % 2 == 0) { + res += y; + } + } + + check.wait(round * threads_n); + } + })); + } + td::do_not_optimize_away(res); + for (auto &thread : threads) { + thread.join(); + } +} +TEST(StealingQueue, simple) { + uint64 sum; + std::atomic got_sum; + + td::Stage run; + td::Stage check; + + size_t threads_n = 10; + std::vector threads; + std::vector> lq(threads_n); + MpmcQueue gq(threads_n); + + constexpr uint64 XN = 20; + uint64 x_sum[XN]; + x_sum[0] = 0; + x_sum[1] = 1; + for (uint64 i = 2; i < XN; i++) { + x_sum[i] = i + x_sum[i - 1] + x_sum[i - 2]; + } + + td::Random::Xorshift128plus rnd(123); + for (size_t i = 0; i < threads_n; i++) { + threads.push_back(td::thread([&, id = static_cast(i)] { + for (uint64 round = 1; round < 10000; round++) { + if (id == 0) { + sum = 0; + int n = rnd() % 5; + for (int j = 0; j < n; j++) { + int x = rand() % XN; + sum += x_sum[x]; + gq.push(x, id); + } + got_sum = 0; + } + run.wait(round * threads_n); + while (got_sum.load() != sum) { + auto x = [&] { + int res; + if (lq[id].local_pop(res)) { + return res; + } + if (gq.try_pop(res, id)) { + return res; + } + if (lq[id].steal(res, lq[rand() % threads_n])) { + //LOG(ERROR) << "STEAL"; + return res; + } + return 0; + }(); + if (x == 0) { + continue; + } + //LOG(ERROR) << x << " " << got_sum.load() << " " << sum; + got_sum.fetch_add(x, std::memory_order_relaxed); + lq[id].local_push(x - 1, [&](auto y) { + //LOG(ERROR) << "OVERFLOW"; + gq.push(y, id); + }); + if (x > 1) { + lq[id].local_push(x - 2, [&](auto y) { gq.push(y, id); }); + } + } + check.wait(round * threads_n); + } + })); + } + for (auto &thread : threads) { + thread.join(); + } +} +} // namespace td diff --git a/submodules/ton/tonlib-src/tdutils/test/log.cpp b/submodules/ton/tonlib-src/tdutils/test/log.cpp index 99be2d59b5..707bb07084 100644 --- a/submodules/ton/tonlib-src/tdutils/test/log.cpp +++ b/submodules/ton/tonlib-src/tdutils/test/log.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/tests.h" #include "td/utils/FileLog.h" @@ -80,7 +80,8 @@ void bench_log(std::string name, int threads_n, F &&f) { }; TEST(Log, TsLogger) { - bench_log("NewTsFileLog", 4, [] { return td::TsFileLog::create("tmplog").move_as_ok(); }); + bench_log("NewTsFileLog", 4, + [] { return td::TsFileLog::create("tmplog", std::numeric_limits::max(), false).move_as_ok(); }); bench_log("TsFileLog", 8, [] { class FileLog : public td::LogInterface { public: diff --git a/submodules/ton/tonlib-src/tdutils/test/misc.cpp b/submodules/ton/tonlib-src/tdutils/test/misc.cpp index b3c472507f..f43fcdcc5e 100644 --- a/submodules/ton/tonlib-src/tdutils/test/misc.cpp +++ b/submodules/ton/tonlib-src/tdutils/test/misc.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "td/utils/as.h" #include "td/utils/base64.h" @@ -220,6 +220,26 @@ TEST(Misc, base64) { "Ojo7ISUiOw=="); } +TEST(Misc, base32) { + ASSERT_EQ("", base32_encode("")); + ASSERT_EQ("me", base32_encode("a")); + base32_decode("me").ensure(); + ASSERT_EQ("mfra", base32_encode("ab")); + ASSERT_EQ("mfrgg", base32_encode("abc")); + ASSERT_EQ("mfrggza", base32_encode("abcd")); + ASSERT_EQ("mfrggzdg", base32_encode("abcdf")); + ASSERT_EQ("mfrggzdgm4", base32_encode("abcdfg")); + for (int l = 0; l < 300000; l += l / 20 + l / 1000 * 500 + 1) { + for (int t = 0; t < 10; t++) { + string s = rand_string(std::numeric_limits::min(), std::numeric_limits::max(), l); + auto encoded = base32_encode(s); + auto decoded = base32_decode(encoded); + ASSERT_TRUE(decoded.is_ok()); + ASSERT_TRUE(decoded.ok() == s); + } + } +} + TEST(Misc, to_integer) { ASSERT_EQ(to_integer("-1234567"), -1234567); ASSERT_EQ(to_integer("-1234567"), -1234567); @@ -570,6 +590,10 @@ static void test_full_split(Slice str, vector expected) { ASSERT_EQ(expected, td::full_split(str)); } +static void test_full_split(Slice str, char c, size_t max_parts, vector expected) { + ASSERT_EQ(expected, td::full_split(str, c, max_parts)); +} + TEST(Misc, full_split) { test_full_split("", {}); test_full_split(" ", {"", ""}); @@ -585,6 +609,7 @@ TEST(Misc, full_split) { test_full_split(" abcdef ", {"", "abcdef", ""}); test_full_split(" ab cd ef ", {"", "ab", "cd", "ef", ""}); test_full_split(" ab cd ef ", {"", "", "ab", "", "cd", "", "ef", "", ""}); + test_full_split("ab cd ef gh", ' ', 3, {"ab", "cd", "ef gh"}); } TEST(Misc, StringBuilder) { diff --git a/submodules/ton/tonlib-src/terminal/terminal.cpp b/submodules/ton/tonlib-src/terminal/terminal.cpp index c0b44e557e..9b4ae37418 100644 --- a/submodules/ton/tonlib-src/terminal/terminal.cpp +++ b/submodules/ton/tonlib-src/terminal/terminal.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "terminal.hpp" #include "td/utils/port/StdStreams.h" @@ -29,11 +29,11 @@ namespace td { void TerminalLogInterface::append(CSlice slice, int log_level) { - auto instance_ = TerminalIOImpl::instance(); - if (!instance_) { + auto instance = TerminalIOImpl::instance(); + if (!instance) { default_log_interface->append(slice, log_level); } else { - instance_->deactivate_readline(); + instance->deactivate_readline(); std::string color; if (log_level == 0 || log_level == 1) { color = TC_RED; @@ -43,7 +43,7 @@ void TerminalLogInterface::append(CSlice slice, int log_level) { color = TC_GREEN; } td::TsCerr() << color << slice << TC_EMPTY; - instance_->reactivate_readline(); + instance->reactivate_readline(); if (log_level == VERBOSITY_NAME(FATAL)) { process_fatal_error(slice); } @@ -82,6 +82,16 @@ void TerminalIOImpl::output_line(std::string line) { reactivate_readline(); } +void TerminalIOImpl::output_line_stderr(std::string line) { + deactivate_readline(); + if (use_readline_) { + Stdout().write(line).ensure(); + } else { + Stderr().write(line).ensure(); + } + reactivate_readline(); +} + void TerminalIOImpl::start_up() { instance_ = this; self_ = actor_id(this); @@ -206,17 +216,17 @@ void TerminalIOImpl::s_line(char *line) { LOG(FATAL) << "Closed"; return; } - CHECK(instance_); + CHECK(instance); if (*line) { add_history(line); } - instance_->line_cb(line); + instance()->line_cb(line); rl_free(line); #endif } int TerminalIOImpl::s_stdin_getc(FILE *) { - return instance_->stdin_getc(); + return instance()->stdin_getc(); } void TerminalIOImpl::set_log_interface() { @@ -240,32 +250,81 @@ void TerminalIOImpl::line_cb(std::string cmd) { cmd_queue_.push(td::BufferSlice{std::move(cmd)}); } -void TerminalIO::output(std::string line) { - auto instance_ = TerminalIOImpl::instance(); - if (!instance_) { - std::cout << line; - } else { - instance_->deactivate_readline(); - td::TsCerr() << line; - instance_->reactivate_readline(); +void TerminalIO::output_stdout(td::Slice slice, double max_wait) { + auto &fd = td::Stdout(); + if (fd.empty()) { + return; + } + double end_time = 0; + while (!slice.empty()) { + auto res = fd.write(slice); + if (res.is_error()) { + if (res.error().code() == EPIPE) { + break; + } + // Resource temporary unavailable + if (end_time == 0) { + end_time = Time::now() + max_wait; + } else if (Time::now() > end_time) { + break; + } + continue; + } + slice.remove_prefix(res.ok()); } } +void TerminalIO::output(std::string line) { + output(td::Slice(line)); +} + void TerminalIO::output(td::Slice line) { - auto instance_ = TerminalIOImpl::instance(); - if (!instance_) { + auto instance = TerminalIOImpl::instance(); + if (!instance) { + output_stdout(line, 10.0); + } else { + instance->deactivate_readline(); + output_stdout(line, 10.0); + instance->reactivate_readline(); + } +} + +void TerminalIO::output_stderr(std::string line) { + output_stderr(td::Slice(line)); +} + +void TerminalIO::output_stderr(td::Slice line) { + auto instance = TerminalIOImpl::instance(); + if (!instance) { td::TsCerr() << line; } else { - instance_->deactivate_readline(); - td::TsCerr() << line; - instance_->reactivate_readline(); + if (instance->readline_used()) { + instance->deactivate_readline(); + output_stdout(line, 0.01); + instance->reactivate_readline(); + } else { + td::TsCerr() << line; + } + } +} + +void TerminalIOOutputter::flush() { + if (buffer_) { + CHECK(sb_); + if (!sb_->as_cslice().empty()) { + if (is_err_) { + TerminalIO::output_stderr(sb_->as_cslice()); + } else { + TerminalIO::output(sb_->as_cslice()); + } + } + sb_->clear(); } } TerminalIOOutputter::~TerminalIOOutputter() { if (buffer_) { - CHECK(sb_); - TerminalIO::output(sb_->as_cslice()); + flush(); delete[] buffer_; } } diff --git a/submodules/ton/tonlib-src/terminal/terminal.h b/submodules/ton/tonlib-src/terminal/terminal.h index 49a7d7b324..baa5df2e7e 100644 --- a/submodules/ton/tonlib-src/terminal/terminal.h +++ b/submodules/ton/tonlib-src/terminal/terminal.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -29,8 +29,10 @@ namespace td { class TerminalIOOutputter { public: static const size_t BUFFER_SIZE = 128 * 1024; - TerminalIOOutputter() - : buffer_(new char[BUFFER_SIZE]), sb_(std::make_unique(td::MutableSlice{buffer_, BUFFER_SIZE})) { + TerminalIOOutputter(bool is_err) + : buffer_(new char[BUFFER_SIZE]) + , is_err_(is_err) + , sb_(std::make_unique(td::MutableSlice{buffer_, BUFFER_SIZE}, true)) { } TerminalIOOutputter(TerminalIOOutputter &&X) = default; @@ -54,10 +56,12 @@ class TerminalIOOutputter { bool is_error() const { return sb_->is_error(); } + void flush(); ~TerminalIOOutputter(); private: char *buffer_; + bool is_err_; std::unique_ptr sb_; }; @@ -75,11 +79,19 @@ class TerminalIO : public actor::Actor { virtual void update_callback(std::unique_ptr callback) = 0; static void output(std::string line); static void output(td::Slice slice); + static void output_stderr(std::string line); + static void output_stderr(td::Slice slice); + static void output_stdout(td::Slice line, double max_wait); static TerminalIOOutputter out() { - return TerminalIOOutputter{}; + return TerminalIOOutputter{false}; + } + static TerminalIOOutputter err() { + return TerminalIOOutputter{true}; } virtual void output_line(std::string line) = 0; + virtual void output_line_stderr(std::string line) = 0; virtual void set_log_interface() = 0; + virtual bool readline_used() const = 0; static td::actor::ActorOwn create(std::string prompt, bool use_readline, std::unique_ptr callback); diff --git a/submodules/ton/tonlib-src/terminal/terminal.hpp b/submodules/ton/tonlib-src/terminal/terminal.hpp index 637d753b45..481b7a5088 100644 --- a/submodules/ton/tonlib-src/terminal/terminal.hpp +++ b/submodules/ton/tonlib-src/terminal/terminal.hpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -45,6 +45,10 @@ class TerminalIOImpl : public TerminalIO, td::ObserverBase { void deactivate_readline(); void reactivate_readline(); void output_line(std::string line) override; + void output_line_stderr(std::string line) override; + bool readline_used() const override { + return use_readline_; + } void set_log_interface() override; //void read_line(); void loop() override; diff --git a/submodules/ton/tonlib-src/test/regression-tests.ans b/submodules/ton/tonlib-src/test/regression-tests.ans index 29e26328dc..f58e3ee10d 100644 --- a/submodules/ton/tonlib-src/test/regression-tests.ans +++ b/submodules/ton/tonlib-src/test/regression-tests.ans @@ -7,7 +7,7 @@ Test_Fift_bug_newlize_default e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca4 Test_Fift_bug_ufits_default 51bf5a9f1ed7633a193f6fdd17a7a3af8e032dfe72a9669c85e8639aa8a7c195 Test_Fift_contfrac_default 09ebce5c91bcb70696c6fb6981d82dc3b9e3444dab608a7a1b044c0ddd778a96 Test_Fift_test_default 4e44b3382963ec89f7b5c8f2ebd85da3bc8aebad5b49f5b11b14075061477b4d -Test_Fift_test_dict_default 480d22a6ec25a232febf4eec8ff64747573f79721327e7ff3b1aa7ea4921bbb4 +Test_Fift_test_dict_default a9c8cbcfdece5573185022cea07f59f1bc404e5d879e5157a5745757f8ee0525 Test_Fift_test_fixed_default 278a19d56b773102caf5c1fe2997ea6c8d0d9e720eff8503feede6398a197eec Test_Fift_test_sort2_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a Test_Fift_test_sort_default 9b57d47e6a10e7d1bbb565db35400debf2f963031f434742a702ec76555a5d3a @@ -15,15 +15,15 @@ Test_Fift_testvm2_default 8a6e35fc0224398be9d2de39d31c86ea96965ef1eca2aa9e0af230 Test_Fift_testvm3_default 3c1b77471c5fd914ed8b5f528b9faed618e278693f5030b953ff150e543864ae Test_Fift_testvm4_default 8a6e35fc0224398be9d2de39d31c86ea96965ef1eca2aa9e0af2303150ed4a7b Test_Fift_testvm4a_default 523b561d6bf2f5ebb26a755e687bfbda8e33462c98e9978119755f79a086cf5e -Test_Fift_testvm4b_default daf8567bd58f05c10bb6596cea33b63e1061fa02dd5560db18ff22f96736f0d5 +Test_Fift_testvm4b_default e6d16e7217d0b2a3f0b38be0e3af0e28a70c925ccbc1c4d9890e25b8973e565a Test_Fift_testvm4c_default 2bbd67831d90bceaae29546ee3a58c4d376c2e8fb6a5b8ea2eae3ab8787e063e -Test_Fift_testvm4d_default 32eee098378e64c938dea09990287a349d0d8f6aabb7360535c782a958cd5fea +Test_Fift_testvm4d_default 9e8de54cfc3676ba4e817a4bd0367655d3514b898fecb3e71178e5aff8e35f83 Test_Fift_testvm5_default bab109acfdf626a192171d74c69c3176d661a8dedf730aea616d4997b98830f1 Test_Fift_testvm6_default dd6353c8f3f21cf62a4769ee1f3daaec46f43fd633ffb84c5d6535b120af9027 Test_Fift_testvm7_default 77f54b6c8c9a728d262e912efcc347de7014a37d08793c3adeac8b96fe063342 Test_Fift_testvm8_default 17c9e2205ccecfd8549328b4a501d07dde0336899a7a496e747e1032ad5efff9 Test_Fift_testvm_default ee4cbfec76c050b6de7877cfc39817d594cd1e175b6265b76fb642e30b940437 -Test_Fift_testvmprog_default 3aeebf868c0492f2bafe339505751449e9d258bf25ea5d956efe70c6fce408ed +Test_Fift_testvmprog_default e5d0b2c68ee568280877c8495be558bfd0054ca5d99a99eebb525bbeca8a65af Test_RefInt_main_default 768493e0aef8e09a401a6d369edd1ef503a9215fb09dc460f52b27a8bde767cb Test_VM_assert_code_not_null_default 05bc07e129181c972b976442f200de9487dee8bfb5ac53dd36ff61c5d4d4291d Test_VM_assert_extract_minmax_key_default c352309c61bdf62ba7a0ba7280d303c88b0696fe7efa550c05feb2c662275297 diff --git a/submodules/ton/tonlib-src/test/test-hello-world.cpp b/submodules/ton/tonlib-src/test/test-hello-world.cpp index 427528f108..3a659f578d 100644 --- a/submodules/ton/tonlib-src/test/test-hello-world.cpp +++ b/submodules/ton/tonlib-src/test/test-hello-world.cpp @@ -31,6 +31,7 @@ #include "auto/tl/ton_api_json.h" #include "tl/tl_json.h" +#include "td/utils/Random.h" namespace { std::string config = R"json( @@ -135,4 +136,25 @@ int main() { return res; }; test_tl_json(ton::ton_api::make_object(create_vector_bytes())); + + td::Bits256 x; + td::Random::secure_bytes(x.as_slice()); + + auto s = x.to_hex(); + + auto v = td::hex_decode(s).move_as_ok(); + + auto w = td::buffer_to_hex(x.as_slice()); + + td::Bits256 y; + y.as_slice().copy_from(v); + + CHECK(x == y); + + auto w2 = td::hex_decode(w).move_as_ok(); + td::Bits256 z; + z.as_slice().copy_from(w2); + + LOG_CHECK(x == z) << s << " " << w; + return 0; } diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp index 0b4ab90328..4e111c93b7 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.cpp @@ -58,6 +58,8 @@ object_ptr Object::fetch(td::TlParser &p) { return liteServer_masterchainInfoExt::fetch(p); case liteServer_partialBlockProof::ID: return liteServer_partialBlockProof::fetch(p); + case liteServer_runMethodResult::ID: + return liteServer_runMethodResult::fetch(p); case liteServer_sendMsgStatus::ID: return liteServer_sendMsgStatus::fetch(p); case liteServer_shardInfo::ID: @@ -74,6 +76,8 @@ object_ptr Object::fetch(td::TlParser &p) { return liteServer_transactionInfo::fetch(p); case liteServer_transactionList::ID: return liteServer_transactionList::fetch(p); + case liteServer_validatorStats::ID: + return liteServer_validatorStats::fetch(p); case liteServer_version::ID: return liteServer_version::fetch(p); case liteServer_debug_verbosity::ID: @@ -122,6 +126,8 @@ object_ptr Function::fetch(td::TlParser &p) { return liteServer_getTime::fetch(p); case liteServer_getTransactions::ID: return liteServer_getTransactions::fetch(p); + case liteServer_getValidatorStats::ID: + return liteServer_getValidatorStats::fetch(p); case liteServer_getVersion::ID: return liteServer_getVersion::fetch(p); case liteServer_listBlockTransactions::ID: @@ -132,6 +138,8 @@ object_ptr Function::fetch(td::TlParser &p) { return liteServer_query::fetch(p); case liteServer_queryPrefix::ID: return liteServer_queryPrefix::fetch(p); + case liteServer_runSmcMethod::ID: + return liteServer_runSmcMethod::fetch(p); case liteServer_sendMessage::ID: return liteServer_sendMessage::fetch(p); case liteServer_waitMasterchainSeqno::ID: @@ -1098,6 +1106,101 @@ void liteServer_partialBlockProof::store(td::TlStorerToString &s, const char *fi } } +liteServer_runMethodResult::liteServer_runMethodResult() + : mode_() + , id_() + , shardblk_() + , shard_proof_() + , proof_() + , state_proof_() + , init_c7_() + , lib_extras_() + , exit_code_() + , result_() +{} + +liteServer_runMethodResult::liteServer_runMethodResult(std::int32_t mode_, object_ptr &&id_, object_ptr &&shardblk_, td::BufferSlice &&shard_proof_, td::BufferSlice &&proof_, td::BufferSlice &&state_proof_, td::BufferSlice &&init_c7_, td::BufferSlice &&lib_extras_, std::int32_t exit_code_, td::BufferSlice &&result_) + : mode_(mode_) + , id_(std::move(id_)) + , shardblk_(std::move(shardblk_)) + , shard_proof_(std::move(shard_proof_)) + , proof_(std::move(proof_)) + , state_proof_(std::move(state_proof_)) + , init_c7_(std::move(init_c7_)) + , lib_extras_(std::move(lib_extras_)) + , exit_code_(exit_code_) + , result_(std::move(result_)) +{} + +const std::int32_t liteServer_runMethodResult::ID; + +object_ptr liteServer_runMethodResult::fetch(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return nullptr; + object_ptr res = make_object(); + std::int32_t var0; + if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); } + res->id_ = TlFetchObject::parse(p); + res->shardblk_ = TlFetchObject::parse(p); + if (var0 & 1) { res->shard_proof_ = TlFetchBytes::parse(p); } + if (var0 & 1) { res->proof_ = TlFetchBytes::parse(p); } + if (var0 & 2) { res->state_proof_ = TlFetchBytes::parse(p); } + if (var0 & 8) { res->init_c7_ = TlFetchBytes::parse(p); } + if (var0 & 16) { res->lib_extras_ = TlFetchBytes::parse(p); } + res->exit_code_ = TlFetchInt::parse(p); + if (var0 & 4) { res->result_ = TlFetchBytes::parse(p); } + if (p.get_error()) { FAIL(""); } + return res; +#undef FAIL +} + +void liteServer_runMethodResult::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + std::int32_t var0; + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreObject::store(shardblk_, s); + if (var0 & 1) { TlStoreString::store(shard_proof_, s); } + if (var0 & 1) { TlStoreString::store(proof_, s); } + if (var0 & 2) { TlStoreString::store(state_proof_, s); } + if (var0 & 8) { TlStoreString::store(init_c7_, s); } + if (var0 & 16) { TlStoreString::store(lib_extras_, s); } + TlStoreBinary::store(exit_code_, s); + if (var0 & 4) { TlStoreString::store(result_, s); } +} + +void liteServer_runMethodResult::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + std::int32_t var0; + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreObject::store(shardblk_, s); + if (var0 & 1) { TlStoreString::store(shard_proof_, s); } + if (var0 & 1) { TlStoreString::store(proof_, s); } + if (var0 & 2) { TlStoreString::store(state_proof_, s); } + if (var0 & 8) { TlStoreString::store(init_c7_, s); } + if (var0 & 16) { TlStoreString::store(lib_extras_, s); } + TlStoreBinary::store(exit_code_, s); + if (var0 & 4) { TlStoreString::store(result_, s); } +} + +void liteServer_runMethodResult::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "liteServer_runMethodResult"); + std::int32_t var0; + s.store_field("mode", (var0 = mode_)); + if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); } + if (shardblk_ == nullptr) { s.store_field("shardblk", "null"); } else { shardblk_->store(s, "shardblk"); } + if (var0 & 1) { s.store_bytes_field("shard_proof", shard_proof_); } + if (var0 & 1) { s.store_bytes_field("proof", proof_); } + if (var0 & 2) { s.store_bytes_field("state_proof", state_proof_); } + if (var0 & 8) { s.store_bytes_field("init_c7", init_c7_); } + if (var0 & 16) { s.store_bytes_field("lib_extras", lib_extras_); } + s.store_field("exit_code", exit_code_); + if (var0 & 4) { s.store_bytes_field("result", result_); } + s.store_class_end(); + } +} + liteServer_sendMsgStatus::liteServer_sendMsgStatus() : status_() {} @@ -1483,6 +1586,77 @@ void liteServer_transactionList::store(td::TlStorerToString &s, const char *fiel } } +liteServer_validatorStats::liteServer_validatorStats() + : mode_() + , id_() + , count_() + , complete_() + , state_proof_() + , data_proof_() +{} + +liteServer_validatorStats::liteServer_validatorStats(std::int32_t mode_, object_ptr &&id_, std::int32_t count_, bool complete_, td::BufferSlice &&state_proof_, td::BufferSlice &&data_proof_) + : mode_(mode_) + , id_(std::move(id_)) + , count_(count_) + , complete_(complete_) + , state_proof_(std::move(state_proof_)) + , data_proof_(std::move(data_proof_)) +{} + +const std::int32_t liteServer_validatorStats::ID; + +object_ptr liteServer_validatorStats::fetch(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return nullptr; + object_ptr res = make_object(); + std::int32_t var0; + if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); } + res->id_ = TlFetchObject::parse(p); + res->count_ = TlFetchInt::parse(p); + res->complete_ = TlFetchBool::parse(p); + res->state_proof_ = TlFetchBytes::parse(p); + res->data_proof_ = TlFetchBytes::parse(p); + if (p.get_error()) { FAIL(""); } + return res; +#undef FAIL +} + +void liteServer_validatorStats::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + std::int32_t var0; + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreBinary::store(count_, s); + TlStoreBool::store(complete_, s); + TlStoreString::store(state_proof_, s); + TlStoreString::store(data_proof_, s); +} + +void liteServer_validatorStats::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + std::int32_t var0; + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreBinary::store(count_, s); + TlStoreBool::store(complete_, s); + TlStoreString::store(state_proof_, s); + TlStoreString::store(data_proof_, s); +} + +void liteServer_validatorStats::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "liteServer_validatorStats"); + std::int32_t var0; + s.store_field("mode", (var0 = mode_)); + if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); } + s.store_field("count", count_); + s.store_field("complete", complete_); + s.store_bytes_field("state_proof", state_proof_); + s.store_bytes_field("data_proof", data_proof_); + s.store_class_end(); + } +} + liteServer_version::liteServer_version() : mode_() , version_() @@ -2462,6 +2636,76 @@ liteServer_getTransactions::ReturnType liteServer_getTransactions::fetch_result( #undef FAIL } +liteServer_getValidatorStats::liteServer_getValidatorStats() + : mode_() + , id_() + , limit_() + , start_after_() + , modified_after_() +{} + +liteServer_getValidatorStats::liteServer_getValidatorStats(std::int32_t mode_, object_ptr &&id_, std::int32_t limit_, td::Bits256 const &start_after_, std::int32_t modified_after_) + : mode_(mode_) + , id_(std::move(id_)) + , limit_(limit_) + , start_after_(start_after_) + , modified_after_(modified_after_) +{} + +const std::int32_t liteServer_getValidatorStats::ID; + +object_ptr liteServer_getValidatorStats::fetch(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return nullptr; + object_ptr res = make_object(); + std::int32_t var0; + if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); } + res->id_ = TlFetchObject::parse(p); + res->limit_ = TlFetchInt::parse(p); + if (var0 & 1) { res->start_after_ = TlFetchInt256::parse(p); } + if (var0 & 4) { res->modified_after_ = TlFetchInt::parse(p); } + if (p.get_error()) { FAIL(""); } + return res; +#undef FAIL +} + +void liteServer_getValidatorStats::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + s.store_binary(152721596); + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreBinary::store(limit_, s); + if (var0 & 1) { TlStoreBinary::store(start_after_, s); } + if (var0 & 4) { TlStoreBinary::store(modified_after_, s); } +} + +void liteServer_getValidatorStats::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + s.store_binary(152721596); + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreBinary::store(limit_, s); + if (var0 & 1) { TlStoreBinary::store(start_after_, s); } + if (var0 & 4) { TlStoreBinary::store(modified_after_, s); } +} + +void liteServer_getValidatorStats::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "liteServer_getValidatorStats"); + s.store_field("mode", (var0 = mode_)); + if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); } + s.store_field("limit", limit_); + if (var0 & 1) { s.store_field("start_after", start_after_); } + if (var0 & 4) { s.store_field("modified_after", modified_after_); } + s.store_class_end(); + } +} + +liteServer_getValidatorStats::ReturnType liteServer_getValidatorStats::fetch_result(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return ReturnType() + return TlFetchBoxed, -1174956328>::parse(p); +#undef FAIL +} + liteServer_getVersion::liteServer_getVersion() { } @@ -2727,6 +2971,76 @@ liteServer_queryPrefix::ReturnType liteServer_queryPrefix::fetch_result(td::TlPa #undef FAIL } +liteServer_runSmcMethod::liteServer_runSmcMethod() + : mode_() + , id_() + , account_() + , method_id_() + , params_() +{} + +liteServer_runSmcMethod::liteServer_runSmcMethod(std::int32_t mode_, object_ptr &&id_, object_ptr &&account_, std::int64_t method_id_, td::BufferSlice &¶ms_) + : mode_(mode_) + , id_(std::move(id_)) + , account_(std::move(account_)) + , method_id_(method_id_) + , params_(std::move(params_)) +{} + +const std::int32_t liteServer_runSmcMethod::ID; + +object_ptr liteServer_runSmcMethod::fetch(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return nullptr; + object_ptr res = make_object(); + std::int32_t var0; + if ((var0 = res->mode_ = TlFetchInt::parse(p)) < 0) { FAIL("Variable of type # can't be negative"); } + res->id_ = TlFetchObject::parse(p); + res->account_ = TlFetchObject::parse(p); + res->method_id_ = TlFetchLong::parse(p); + res->params_ = TlFetchBytes::parse(p); + if (p.get_error()) { FAIL(""); } + return res; +#undef FAIL +} + +void liteServer_runSmcMethod::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + s.store_binary(1556504018); + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreObject::store(account_, s); + TlStoreBinary::store(method_id_, s); + TlStoreString::store(params_, s); +} + +void liteServer_runSmcMethod::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + s.store_binary(1556504018); + TlStoreBinary::store((var0 = mode_), s); + TlStoreObject::store(id_, s); + TlStoreObject::store(account_, s); + TlStoreBinary::store(method_id_, s); + TlStoreString::store(params_, s); +} + +void liteServer_runSmcMethod::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "liteServer_runSmcMethod"); + s.store_field("mode", (var0 = mode_)); + if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); } + if (account_ == nullptr) { s.store_field("account", "null"); } else { account_->store(s, "account"); } + s.store_field("method_id", method_id_); + s.store_bytes_field("params", params_); + s.store_class_end(); + } +} + +liteServer_runSmcMethod::ReturnType liteServer_runSmcMethod::fetch_result(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return ReturnType() + return TlFetchBoxed, -1550163605>::parse(p); +#undef FAIL +} + liteServer_sendMessage::liteServer_sendMessage() : body_() {} diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h index a4a67f3c22..65daf24c62 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.h @@ -84,6 +84,8 @@ class liteServer_masterchainInfoExt; class liteServer_partialBlockProof; +class liteServer_runMethodResult; + class liteServer_sendMsgStatus; class liteServer_shardInfo; @@ -100,6 +102,8 @@ class liteServer_transactionInfo; class liteServer_transactionList; +class liteServer_validatorStats; + class liteServer_version; class liteServer_debug_verbosity; @@ -581,6 +585,38 @@ class liteServer_partialBlockProof final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class liteServer_runMethodResult final : public Object { + public: + std::int32_t mode_; + object_ptr id_; + object_ptr shardblk_; + td::BufferSlice shard_proof_; + td::BufferSlice proof_; + td::BufferSlice state_proof_; + td::BufferSlice init_c7_; + td::BufferSlice lib_extras_; + std::int32_t exit_code_; + td::BufferSlice result_; + enum Flags : std::int32_t {SHARD_PROOF_MASK = 1, PROOF_MASK = 1, STATE_PROOF_MASK = 2, INIT_C7_MASK = 8, LIB_EXTRAS_MASK = 16, RESULT_MASK = 4}; + + liteServer_runMethodResult(); + + liteServer_runMethodResult(std::int32_t mode_, object_ptr &&id_, object_ptr &&shardblk_, td::BufferSlice &&shard_proof_, td::BufferSlice &&proof_, td::BufferSlice &&state_proof_, td::BufferSlice &&init_c7_, td::BufferSlice &&lib_extras_, std::int32_t exit_code_, td::BufferSlice &&result_); + + static const std::int32_t ID = -1550163605; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class liteServer_sendMsgStatus final : public Object { public: std::int32_t status_; @@ -785,6 +821,33 @@ class liteServer_transactionList final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class liteServer_validatorStats final : public Object { + public: + std::int32_t mode_; + object_ptr id_; + std::int32_t count_; + bool complete_; + td::BufferSlice state_proof_; + td::BufferSlice data_proof_; + + liteServer_validatorStats(); + + liteServer_validatorStats(std::int32_t mode_, object_ptr &&id_, std::int32_t count_, bool complete_, td::BufferSlice &&state_proof_, td::BufferSlice &&data_proof_); + + static const std::int32_t ID = -1174956328; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class liteServer_version final : public Object { public: std::int32_t mode_; @@ -1310,6 +1373,38 @@ class liteServer_getTransactions final : public Function { static ReturnType fetch_result(td::TlParser &p); }; +class liteServer_getValidatorStats final : public Function { + public: + std::int32_t mode_; + object_ptr id_; + std::int32_t limit_; + td::Bits256 start_after_; + std::int32_t modified_after_; + enum Flags : std::int32_t {START_AFTER_MASK = 1, MODIFIED_AFTER_MASK = 4}; + mutable std::int32_t var0; + + liteServer_getValidatorStats(); + + liteServer_getValidatorStats(std::int32_t mode_, object_ptr &&id_, std::int32_t limit_, td::Bits256 const &start_after_, std::int32_t modified_after_); + + static const std::int32_t ID = 152721596; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + static object_ptr fetch(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; + + static ReturnType fetch_result(td::TlParser &p); +}; + class liteServer_getVersion final : public Function { public: @@ -1453,6 +1548,37 @@ class liteServer_queryPrefix final : public Function { static ReturnType fetch_result(td::TlParser &p); }; +class liteServer_runSmcMethod final : public Function { + public: + std::int32_t mode_; + object_ptr id_; + object_ptr account_; + std::int64_t method_id_; + td::BufferSlice params_; + mutable std::int32_t var0; + + liteServer_runSmcMethod(); + + liteServer_runSmcMethod(std::int32_t mode_, object_ptr &&id_, object_ptr &&account_, std::int64_t method_id_, td::BufferSlice &¶ms_); + + static const std::int32_t ID = 1556504018; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + static object_ptr fetch(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; + + static ReturnType fetch_result(td::TlParser &p); +}; + class liteServer_sendMessage final : public Function { public: td::BufferSlice body_; diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp index 9c9062b427..540dfb6d49 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/lite_api.hpp @@ -65,6 +65,9 @@ bool downcast_call(Object &obj, const T &func) { case liteServer_partialBlockProof::ID: func(static_cast(obj)); return true; + case liteServer_runMethodResult::ID: + func(static_cast(obj)); + return true; case liteServer_sendMsgStatus::ID: func(static_cast(obj)); return true; @@ -89,6 +92,9 @@ bool downcast_call(Object &obj, const T &func) { case liteServer_transactionList::ID: func(static_cast(obj)); return true; + case liteServer_validatorStats::ID: + func(static_cast(obj)); + return true; case liteServer_version::ID: func(static_cast(obj)); return true; @@ -160,6 +166,9 @@ bool downcast_call(Function &obj, const T &func) { case liteServer_getTransactions::ID: func(static_cast(obj)); return true; + case liteServer_getValidatorStats::ID: + func(static_cast(obj)); + return true; case liteServer_getVersion::ID: func(static_cast(obj)); return true; @@ -175,6 +184,9 @@ bool downcast_call(Function &obj, const T &func) { case liteServer_queryPrefix::ID: func(static_cast(obj)); return true; + case liteServer_runSmcMethod::ID: + func(static_cast(obj)); + return true; case liteServer_sendMessage::ID: func(static_cast(obj)); return true; diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp index 5c8b605177..b23e07ced9 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.cpp @@ -212,8 +212,20 @@ object_ptr Object::fetch(td::TlParser &p) { return db_filedb_key_signatures::fetch(p); case db_filedb_key_candidate::ID: return db_filedb_key_candidate::fetch(p); + case db_filedb_key_blockInfo::ID: + return db_filedb_key_blockInfo::fetch(p); case db_filedb_value::ID: return db_filedb_value::fetch(p); + case db_files_index_key::ID: + return db_files_index_key::fetch(p); + case db_files_package_key::ID: + return db_files_package_key::fetch(p); + case db_files_index_value::ID: + return db_files_index_value::fetch(p); + case db_files_package_firstBlock::ID: + return db_files_package_firstBlock::fetch(p); + case db_files_package_value::ID: + return db_files_package_value::fetch(p); case db_lt_el_key::ID: return db_lt_el_key::fetch(p); case db_lt_desc_key::ID: @@ -242,6 +254,8 @@ object_ptr Object::fetch(td::TlParser &p) { return db_root_key_config::fetch(p); case db_state_asyncSerializer::ID: return db_state_asyncSerializer::fetch(p); + case db_state_dbVersion::ID: + return db_state_dbVersion::fetch(p); case db_state_destroyedSessions::ID: return db_state_destroyedSessions::fetch(p); case db_state_gcBlockId::ID: @@ -262,6 +276,8 @@ object_ptr Object::fetch(td::TlParser &p) { return db_state_key_asyncSerializer::fetch(p); case db_state_key_hardforks::ID: return db_state_key_hardforks::fetch(p); + case db_state_key_dbVersion::ID: + return db_state_key_dbVersion::fetch(p); case db_state_shardClient::ID: return db_state_shardClient::fetch(p); case dht_key::ID: @@ -366,6 +382,18 @@ object_ptr Object::fetch(td::TlParser &p) { return fec_roundRobin::fetch(p); case fec_online::ID: return fec_online::fetch(p); + case http_header::ID: + return http_header::fetch(p); + case http_payloadPart::ID: + return http_payloadPart::fetch(p); + case http_response::ID: + return http_response::fetch(p); + case http_server_config::ID: + return http_server_config::fetch(p); + case http_server_dnsEntry::ID: + return http_server_dnsEntry::fetch(p); + case http_server_host::ID: + return http_server_host::fetch(p); case id_config_local::ID: return id_config_local::fetch(p); case liteclient_config_global::ID: @@ -442,6 +470,10 @@ object_ptr Object::fetch(td::TlParser &p) { return ton_blockId::fetch(p); case ton_blockIdApprove::ID: return ton_blockIdApprove::fetch(p); + case tonNode_archiveNotFound::ID: + return tonNode_archiveNotFound::fetch(p); + case tonNode_archiveInfo::ID: + return tonNode_archiveInfo::fetch(p); case tonNode_blockDescriptionEmpty::ID: return tonNode_blockDescriptionEmpty::fetch(p); case tonNode_blockDescription::ID: @@ -640,6 +672,10 @@ object_ptr Function::fetch(td::TlParser &p) { return engine_validator_sign::fetch(p); case getTestObject::ID: return getTestObject::fetch(p); + case http_getNextPayloadPart::ID: + return http_getNextPayloadPart::fetch(p); + case http_request::ID: + return http_request::fetch(p); case overlay_getBroadcast::ID: return overlay_getBroadcast::fetch(p); case overlay_getBroadcastList::ID: @@ -672,6 +708,10 @@ object_ptr Function::fetch(td::TlParser &p) { return tonNode_downloadPersistentStateSlice::fetch(p); case tonNode_downloadZeroState::ID: return tonNode_downloadZeroState::fetch(p); + case tonNode_getArchiveInfo::ID: + return tonNode_getArchiveInfo::fetch(p); + case tonNode_getArchiveSlice::ID: + return tonNode_getArchiveSlice::fetch(p); case tonNode_getCapabilities::ID: return tonNode_getCapabilities::fetch(p); case tonNode_getNextBlockDescription::ID: @@ -4352,9 +4392,10 @@ db_block_info::db_block_info() , lt_() , ts_() , state_() + , masterchain_ref_seqno_() {} -db_block_info::db_block_info(object_ptr &&id_, std::int32_t flags_, object_ptr &&prev_left_, object_ptr &&prev_right_, object_ptr &&next_left_, object_ptr &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_) +db_block_info::db_block_info(object_ptr &&id_, std::int32_t flags_, object_ptr &&prev_left_, object_ptr &&prev_right_, object_ptr &&next_left_, object_ptr &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_, std::int32_t masterchain_ref_seqno_) : id_(std::move(id_)) , flags_(flags_) , prev_left_(std::move(prev_left_)) @@ -4364,6 +4405,7 @@ db_block_info::db_block_info(object_ptr &&id_, std::int32_t , lt_(lt_) , ts_(ts_) , state_(state_) + , masterchain_ref_seqno_(masterchain_ref_seqno_) {} const std::int32_t db_block_info::ID; @@ -4381,6 +4423,7 @@ object_ptr db_block_info::fetch(td::TlParser &p) { if (var0 & 8192) { res->lt_ = TlFetchLong::parse(p); } if (var0 & 16384) { res->ts_ = TlFetchInt::parse(p); } if (var0 & 131072) { res->state_ = TlFetchInt256::parse(p); } + if (var0 & 8388608) { res->masterchain_ref_seqno_ = TlFetchInt::parse(p); } if (p.get_error()) { FAIL(""); } return std::move(res); #undef FAIL @@ -4398,6 +4441,7 @@ void db_block_info::store(td::TlStorerCalcLength &s) const { if (var0 & 8192) { TlStoreBinary::store(lt_, s); } if (var0 & 16384) { TlStoreBinary::store(ts_, s); } if (var0 & 131072) { TlStoreBinary::store(state_, s); } + if (var0 & 8388608) { TlStoreBinary::store(masterchain_ref_seqno_, s); } } void db_block_info::store(td::TlStorerUnsafe &s) const { @@ -4412,6 +4456,7 @@ void db_block_info::store(td::TlStorerUnsafe &s) const { if (var0 & 8192) { TlStoreBinary::store(lt_, s); } if (var0 & 16384) { TlStoreBinary::store(ts_, s); } if (var0 & 131072) { TlStoreBinary::store(state_, s); } + if (var0 & 8388608) { TlStoreBinary::store(masterchain_ref_seqno_, s); } } void db_block_info::store(td::TlStorerToString &s, const char *field_name) const { @@ -4427,6 +4472,7 @@ void db_block_info::store(td::TlStorerToString &s, const char *field_name) const if (var0 & 8192) { s.store_field("lt", lt_); } if (var0 & 16384) { s.store_field("ts", ts_); } if (var0 & 131072) { s.store_field("state", state_); } + if (var0 & 8388608) { s.store_field("masterchain_ref_seqno", masterchain_ref_seqno_); } s.store_class_end(); } } @@ -4882,6 +4928,8 @@ object_ptr db_filedb_Key::fetch(td::TlParser &p) { return db_filedb_key_signatures::fetch(p); case db_filedb_key_candidate::ID: return db_filedb_key_candidate::fetch(p); + case db_filedb_key_blockInfo::ID: + return db_filedb_key_blockInfo::fetch(p); default: FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor)); } @@ -5191,6 +5239,44 @@ void db_filedb_key_candidate::store(td::TlStorerToString &s, const char *field_n } } +db_filedb_key_blockInfo::db_filedb_key_blockInfo() + : block_id_() +{} + +db_filedb_key_blockInfo::db_filedb_key_blockInfo(object_ptr &&block_id_) + : block_id_(std::move(block_id_)) +{} + +const std::int32_t db_filedb_key_blockInfo::ID; + +object_ptr db_filedb_key_blockInfo::fetch(td::TlParser &p) { + return make_object(p); +} + +db_filedb_key_blockInfo::db_filedb_key_blockInfo(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : block_id_(TlFetchObject::parse(p)) +#undef FAIL +{} + +void db_filedb_key_blockInfo::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreObject::store(block_id_, s); +} + +void db_filedb_key_blockInfo::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreObject::store(block_id_, s); +} + +void db_filedb_key_blockInfo::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_filedb_key_blockInfo"); + if (block_id_ == nullptr) { s.store_field("block_id", "null"); } else { block_id_->store(s, "block_id"); } + s.store_class_end(); + } +} + db_filedb_value::db_filedb_value() : key_() , prev_() @@ -5247,6 +5333,275 @@ void db_filedb_value::store(td::TlStorerToString &s, const char *field_name) con } } +object_ptr db_files_Key::fetch(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return nullptr; + int constructor = p.fetch_int(); + switch (constructor) { + case db_files_index_key::ID: + return db_files_index_key::fetch(p); + case db_files_package_key::ID: + return db_files_package_key::fetch(p); + default: + FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor)); + } +#undef FAIL +} + +db_files_index_key::db_files_index_key() { +} + +const std::int32_t db_files_index_key::ID; + +object_ptr db_files_index_key::fetch(td::TlParser &p) { + return make_object(p); +} + +db_files_index_key::db_files_index_key(td::TlParser &p) +#define FAIL(error) p.set_error(error) +#undef FAIL +{ + (void)p; +} + +void db_files_index_key::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); +} + +void db_files_index_key::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); +} + +void db_files_index_key::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_files_index_key"); + s.store_class_end(); + } +} + +db_files_package_key::db_files_package_key() + : package_id_() + , key_() + , temp_() +{} + +db_files_package_key::db_files_package_key(std::int32_t package_id_, bool key_, bool temp_) + : package_id_(package_id_) + , key_(key_) + , temp_(temp_) +{} + +const std::int32_t db_files_package_key::ID; + +object_ptr db_files_package_key::fetch(td::TlParser &p) { + return make_object(p); +} + +db_files_package_key::db_files_package_key(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : package_id_(TlFetchInt::parse(p)) + , key_(TlFetchBool::parse(p)) + , temp_(TlFetchBool::parse(p)) +#undef FAIL +{} + +void db_files_package_key::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreBinary::store(package_id_, s); + TlStoreBool::store(key_, s); + TlStoreBool::store(temp_, s); +} + +void db_files_package_key::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreBinary::store(package_id_, s); + TlStoreBool::store(key_, s); + TlStoreBool::store(temp_, s); +} + +void db_files_package_key::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_files_package_key"); + s.store_field("package_id", package_id_); + s.store_field("key", key_); + s.store_field("temp", temp_); + s.store_class_end(); + } +} + +db_files_index_value::db_files_index_value() + : packages_() + , key_packages_() + , temp_packages_() +{} + +db_files_index_value::db_files_index_value(std::vector &&packages_, std::vector &&key_packages_, std::vector &&temp_packages_) + : packages_(std::move(packages_)) + , key_packages_(std::move(key_packages_)) + , temp_packages_(std::move(temp_packages_)) +{} + +const std::int32_t db_files_index_value::ID; + +object_ptr db_files_index_value::fetch(td::TlParser &p) { + return make_object(p); +} + +db_files_index_value::db_files_index_value(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : packages_(TlFetchVector::parse(p)) + , key_packages_(TlFetchVector::parse(p)) + , temp_packages_(TlFetchVector::parse(p)) +#undef FAIL +{} + +void db_files_index_value::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreVector::store(packages_, s); + TlStoreVector::store(key_packages_, s); + TlStoreVector::store(temp_packages_, s); +} + +void db_files_index_value::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreVector::store(packages_, s); + TlStoreVector::store(key_packages_, s); + TlStoreVector::store(temp_packages_, s); +} + +void db_files_index_value::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_files_index_value"); + { const std::vector &v = packages_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("packages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); } + { const std::vector &v = key_packages_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("key_packages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); } + { const std::vector &v = temp_packages_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("temp_packages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); } + s.store_class_end(); + } +} + +db_files_package_firstBlock::db_files_package_firstBlock() + : workchain_() + , shard_() + , seqno_() + , unixtime_() + , lt_() +{} + +db_files_package_firstBlock::db_files_package_firstBlock(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::int32_t unixtime_, std::int64_t lt_) + : workchain_(workchain_) + , shard_(shard_) + , seqno_(seqno_) + , unixtime_(unixtime_) + , lt_(lt_) +{} + +const std::int32_t db_files_package_firstBlock::ID; + +object_ptr db_files_package_firstBlock::fetch(td::TlParser &p) { + return make_object(p); +} + +db_files_package_firstBlock::db_files_package_firstBlock(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : workchain_(TlFetchInt::parse(p)) + , shard_(TlFetchLong::parse(p)) + , seqno_(TlFetchInt::parse(p)) + , unixtime_(TlFetchInt::parse(p)) + , lt_(TlFetchLong::parse(p)) +#undef FAIL +{} + +void db_files_package_firstBlock::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreBinary::store(workchain_, s); + TlStoreBinary::store(shard_, s); + TlStoreBinary::store(seqno_, s); + TlStoreBinary::store(unixtime_, s); + TlStoreBinary::store(lt_, s); +} + +void db_files_package_firstBlock::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreBinary::store(workchain_, s); + TlStoreBinary::store(shard_, s); + TlStoreBinary::store(seqno_, s); + TlStoreBinary::store(unixtime_, s); + TlStoreBinary::store(lt_, s); +} + +void db_files_package_firstBlock::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_files_package_firstBlock"); + s.store_field("workchain", workchain_); + s.store_field("shard", shard_); + s.store_field("seqno", seqno_); + s.store_field("unixtime", unixtime_); + s.store_field("lt", lt_); + s.store_class_end(); + } +} + +db_files_package_value::db_files_package_value() + : package_id_() + , key_() + , temp_() + , firstblocks_() + , deleted_() +{} + +db_files_package_value::db_files_package_value(std::int32_t package_id_, bool key_, bool temp_, std::vector> &&firstblocks_, bool deleted_) + : package_id_(package_id_) + , key_(key_) + , temp_(temp_) + , firstblocks_(std::move(firstblocks_)) + , deleted_(deleted_) +{} + +const std::int32_t db_files_package_value::ID; + +object_ptr db_files_package_value::fetch(td::TlParser &p) { + return make_object(p); +} + +db_files_package_value::db_files_package_value(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : package_id_(TlFetchInt::parse(p)) + , key_(TlFetchBool::parse(p)) + , temp_(TlFetchBool::parse(p)) + , firstblocks_(TlFetchVector>::parse(p)) + , deleted_(TlFetchBool::parse(p)) +#undef FAIL +{} + +void db_files_package_value::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreBinary::store(package_id_, s); + TlStoreBool::store(key_, s); + TlStoreBool::store(temp_, s); + TlStoreVector::store(firstblocks_, s); + TlStoreBool::store(deleted_, s); +} + +void db_files_package_value::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreBinary::store(package_id_, s); + TlStoreBool::store(key_, s); + TlStoreBool::store(temp_, s); + TlStoreVector::store(firstblocks_, s); + TlStoreBool::store(deleted_, s); +} + +void db_files_package_value::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_files_package_value"); + s.store_field("package_id", package_id_); + s.store_field("key", key_); + s.store_field("temp", temp_); + { const std::vector> &v = firstblocks_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("firstblocks", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_field("deleted", deleted_); + s.store_class_end(); + } +} + object_ptr db_lt_Key::fetch(td::TlParser &p) { #define FAIL(error) p.set_error(error); return nullptr; int constructor = p.fetch_int(); @@ -5889,6 +6244,44 @@ void db_state_asyncSerializer::store(td::TlStorerToString &s, const char *field_ } } +db_state_dbVersion::db_state_dbVersion() + : version_() +{} + +db_state_dbVersion::db_state_dbVersion(std::int32_t version_) + : version_(version_) +{} + +const std::int32_t db_state_dbVersion::ID; + +object_ptr db_state_dbVersion::fetch(td::TlParser &p) { + return make_object(p); +} + +db_state_dbVersion::db_state_dbVersion(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : version_(TlFetchInt::parse(p)) +#undef FAIL +{} + +void db_state_dbVersion::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreBinary::store(version_, s); +} + +void db_state_dbVersion::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreBinary::store(version_, s); +} + +void db_state_dbVersion::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_state_dbVersion"); + s.store_field("version", version_); + s.store_class_end(); + } +} + db_state_destroyedSessions::db_state_destroyedSessions() : sessions_() {} @@ -6057,6 +6450,8 @@ object_ptr db_state_Key::fetch(td::TlParser &p) { return db_state_key_asyncSerializer::fetch(p); case db_state_key_hardforks::ID: return db_state_key_hardforks::fetch(p); + case db_state_key_dbVersion::ID: + return db_state_key_dbVersion::fetch(p); default: FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor)); } @@ -6249,6 +6644,37 @@ void db_state_key_hardforks::store(td::TlStorerToString &s, const char *field_na } } +db_state_key_dbVersion::db_state_key_dbVersion() { +} + +const std::int32_t db_state_key_dbVersion::ID; + +object_ptr db_state_key_dbVersion::fetch(td::TlParser &p) { + return make_object(p); +} + +db_state_key_dbVersion::db_state_key_dbVersion(td::TlParser &p) +#define FAIL(error) p.set_error(error) +#undef FAIL +{ + (void)p; +} + +void db_state_key_dbVersion::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); +} + +void db_state_key_dbVersion::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); +} + +void db_state_key_dbVersion::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "db_state_key_dbVersion"); + s.store_class_end(); + } +} + db_state_shardClient::db_state_shardClient() : block_() {} @@ -8654,6 +9080,300 @@ void fec_online::store(td::TlStorerToString &s, const char *field_name) const { } } +http_header::http_header() + : name_() + , value_() +{} + +http_header::http_header(std::string const &name_, std::string const &value_) + : name_(std::move(name_)) + , value_(std::move(value_)) +{} + +const std::int32_t http_header::ID; + +object_ptr http_header::fetch(td::TlParser &p) { + return make_object(p); +} + +http_header::http_header(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : name_(TlFetchString::parse(p)) + , value_(TlFetchString::parse(p)) +#undef FAIL +{} + +void http_header::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreString::store(name_, s); + TlStoreString::store(value_, s); +} + +void http_header::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreString::store(name_, s); + TlStoreString::store(value_, s); +} + +void http_header::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_header"); + s.store_field("name", name_); + s.store_field("value", value_); + s.store_class_end(); + } +} + +http_payloadPart::http_payloadPart() + : data_() + , trailer_() + , last_() +{} + +http_payloadPart::http_payloadPart(td::BufferSlice &&data_, std::vector> &&trailer_, bool last_) + : data_(std::move(data_)) + , trailer_(std::move(trailer_)) + , last_(last_) +{} + +const std::int32_t http_payloadPart::ID; + +object_ptr http_payloadPart::fetch(td::TlParser &p) { + return make_object(p); +} + +http_payloadPart::http_payloadPart(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : data_(TlFetchBytes::parse(p)) + , trailer_(TlFetchVector>::parse(p)) + , last_(TlFetchBool::parse(p)) +#undef FAIL +{} + +void http_payloadPart::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreString::store(data_, s); + TlStoreVector::store(trailer_, s); + TlStoreBool::store(last_, s); +} + +void http_payloadPart::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreString::store(data_, s); + TlStoreVector::store(trailer_, s); + TlStoreBool::store(last_, s); +} + +void http_payloadPart::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_payloadPart"); + s.store_bytes_field("data", data_); + { const std::vector> &v = trailer_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("trailer", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_field("last", last_); + s.store_class_end(); + } +} + +http_response::http_response() + : http_version_() + , status_code_() + , reason_() + , headers_() +{} + +http_response::http_response(std::string const &http_version_, std::int32_t status_code_, std::string const &reason_, std::vector> &&headers_) + : http_version_(std::move(http_version_)) + , status_code_(status_code_) + , reason_(std::move(reason_)) + , headers_(std::move(headers_)) +{} + +const std::int32_t http_response::ID; + +object_ptr http_response::fetch(td::TlParser &p) { + return make_object(p); +} + +http_response::http_response(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : http_version_(TlFetchString::parse(p)) + , status_code_(TlFetchInt::parse(p)) + , reason_(TlFetchString::parse(p)) + , headers_(TlFetchVector>::parse(p)) +#undef FAIL +{} + +void http_response::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreString::store(http_version_, s); + TlStoreBinary::store(status_code_, s); + TlStoreString::store(reason_, s); + TlStoreVector::store(headers_, s); +} + +void http_response::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreString::store(http_version_, s); + TlStoreBinary::store(status_code_, s); + TlStoreString::store(reason_, s); + TlStoreVector::store(headers_, s); +} + +void http_response::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_response"); + s.store_field("http_version", http_version_); + s.store_field("status_code", status_code_); + s.store_field("reason", reason_); + { const std::vector> &v = headers_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("headers", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_class_end(); + } +} + +http_server_config::http_server_config() + : dhs_() + , local_hosts_() +{} + +http_server_config::http_server_config(std::vector> &&dhs_, std::vector> &&local_hosts_) + : dhs_(std::move(dhs_)) + , local_hosts_(std::move(local_hosts_)) +{} + +const std::int32_t http_server_config::ID; + +object_ptr http_server_config::fetch(td::TlParser &p) { + return make_object(p); +} + +http_server_config::http_server_config(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : dhs_(TlFetchVector>::parse(p)) + , local_hosts_(TlFetchVector>::parse(p)) +#undef FAIL +{} + +void http_server_config::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreVector::store(dhs_, s); + TlStoreVector::store(local_hosts_, s); +} + +void http_server_config::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreVector::store(dhs_, s); + TlStoreVector::store(local_hosts_, s); +} + +void http_server_config::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_server_config"); + { const std::vector> &v = dhs_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("dhs", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + { const std::vector> &v = local_hosts_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("local_hosts", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_class_end(); + } +} + +http_server_dnsEntry::http_server_dnsEntry() + : domain_() + , addr_() +{} + +http_server_dnsEntry::http_server_dnsEntry(std::string const &domain_, object_ptr &&addr_) + : domain_(std::move(domain_)) + , addr_(std::move(addr_)) +{} + +const std::int32_t http_server_dnsEntry::ID; + +object_ptr http_server_dnsEntry::fetch(td::TlParser &p) { + return make_object(p); +} + +http_server_dnsEntry::http_server_dnsEntry(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : domain_(TlFetchString::parse(p)) + , addr_(TlFetchObject::parse(p)) +#undef FAIL +{} + +void http_server_dnsEntry::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreString::store(domain_, s); + TlStoreObject::store(addr_, s); +} + +void http_server_dnsEntry::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreString::store(domain_, s); + TlStoreObject::store(addr_, s); +} + +void http_server_dnsEntry::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_server_dnsEntry"); + s.store_field("domain", domain_); + if (addr_ == nullptr) { s.store_field("addr", "null"); } else { addr_->store(s, "addr"); } + s.store_class_end(); + } +} + +http_server_host::http_server_host() + : domains_() + , ip_() + , port_() + , adnl_id_() +{} + +http_server_host::http_server_host(std::vector &&domains_, std::int32_t ip_, std::int32_t port_, object_ptr &&adnl_id_) + : domains_(std::move(domains_)) + , ip_(ip_) + , port_(port_) + , adnl_id_(std::move(adnl_id_)) +{} + +const std::int32_t http_server_host::ID; + +object_ptr http_server_host::fetch(td::TlParser &p) { + return make_object(p); +} + +http_server_host::http_server_host(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : domains_(TlFetchVector>::parse(p)) + , ip_(TlFetchInt::parse(p)) + , port_(TlFetchInt::parse(p)) + , adnl_id_(TlFetchObject::parse(p)) +#undef FAIL +{} + +void http_server_host::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreVector::store(domains_, s); + TlStoreBinary::store(ip_, s); + TlStoreBinary::store(port_, s); + TlStoreObject::store(adnl_id_, s); +} + +void http_server_host::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreVector::store(domains_, s); + TlStoreBinary::store(ip_, s); + TlStoreBinary::store(port_, s); + TlStoreObject::store(adnl_id_, s); +} + +void http_server_host::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_server_host"); + { const std::vector &v = domains_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("domains", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); } + s.store_field("ip", ip_); + s.store_field("port", port_); + if (adnl_id_ == nullptr) { s.store_field("adnl_id", "null"); } else { adnl_id_->store(s, "adnl_id"); } + s.store_class_end(); + } +} + id_config_local::id_config_local() : id_() {} @@ -10558,6 +11278,89 @@ void ton_blockIdApprove::store(td::TlStorerToString &s, const char *field_name) } } +object_ptr tonNode_ArchiveInfo::fetch(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return nullptr; + int constructor = p.fetch_int(); + switch (constructor) { + case tonNode_archiveNotFound::ID: + return tonNode_archiveNotFound::fetch(p); + case tonNode_archiveInfo::ID: + return tonNode_archiveInfo::fetch(p); + default: + FAIL(PSTRING() << "Unknown constructor found " << td::format::as_hex(constructor)); + } +#undef FAIL +} + +tonNode_archiveNotFound::tonNode_archiveNotFound() { +} + +const std::int32_t tonNode_archiveNotFound::ID; + +object_ptr tonNode_archiveNotFound::fetch(td::TlParser &p) { + return make_object(p); +} + +tonNode_archiveNotFound::tonNode_archiveNotFound(td::TlParser &p) +#define FAIL(error) p.set_error(error) +#undef FAIL +{ + (void)p; +} + +void tonNode_archiveNotFound::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); +} + +void tonNode_archiveNotFound::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); +} + +void tonNode_archiveNotFound::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tonNode_archiveNotFound"); + s.store_class_end(); + } +} + +tonNode_archiveInfo::tonNode_archiveInfo() + : id_() +{} + +tonNode_archiveInfo::tonNode_archiveInfo(std::int64_t id_) + : id_(id_) +{} + +const std::int32_t tonNode_archiveInfo::ID; + +object_ptr tonNode_archiveInfo::fetch(td::TlParser &p) { + return make_object(p); +} + +tonNode_archiveInfo::tonNode_archiveInfo(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : id_(TlFetchLong::parse(p)) +#undef FAIL +{} + +void tonNode_archiveInfo::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + TlStoreBinary::store(id_, s); +} + +void tonNode_archiveInfo::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + TlStoreBinary::store(id_, s); +} + +void tonNode_archiveInfo::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tonNode_archiveInfo"); + s.store_field("id", id_); + s.store_class_end(); + } +} + object_ptr tonNode_BlockDescription::fetch(td::TlParser &p) { #define FAIL(error) p.set_error(error); return nullptr; int constructor = p.fetch_int(); @@ -15164,6 +15967,134 @@ getTestObject::ReturnType getTestObject::fetch_result(td::TlParser &p) { #undef FAIL } +http_getNextPayloadPart::http_getNextPayloadPart() + : id_() + , seqno_() + , max_chunk_size_() +{} + +http_getNextPayloadPart::http_getNextPayloadPart(td::Bits256 const &id_, std::int32_t seqno_, std::int32_t max_chunk_size_) + : id_(id_) + , seqno_(seqno_) + , max_chunk_size_(max_chunk_size_) +{} + +const std::int32_t http_getNextPayloadPart::ID; + +object_ptr http_getNextPayloadPart::fetch(td::TlParser &p) { + return make_object(p); +} + +http_getNextPayloadPart::http_getNextPayloadPart(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : id_(TlFetchInt256::parse(p)) + , seqno_(TlFetchInt::parse(p)) + , max_chunk_size_(TlFetchInt::parse(p)) +#undef FAIL +{} + +void http_getNextPayloadPart::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + s.store_binary(-1871422196); + TlStoreBinary::store(id_, s); + TlStoreBinary::store(seqno_, s); + TlStoreBinary::store(max_chunk_size_, s); +} + +void http_getNextPayloadPart::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + s.store_binary(-1871422196); + TlStoreBinary::store(id_, s); + TlStoreBinary::store(seqno_, s); + TlStoreBinary::store(max_chunk_size_, s); +} + +void http_getNextPayloadPart::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_getNextPayloadPart"); + s.store_field("id", id_); + s.store_field("seqno", seqno_); + s.store_field("max_chunk_size", max_chunk_size_); + s.store_class_end(); + } +} + +http_getNextPayloadPart::ReturnType http_getNextPayloadPart::fetch_result(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return ReturnType() + return TlFetchBoxed, 693819236>::parse(p); +#undef FAIL +} + +http_request::http_request() + : id_() + , method_() + , url_() + , http_version_() + , headers_() +{} + +http_request::http_request(td::Bits256 const &id_, std::string const &method_, std::string const &url_, std::string const &http_version_, std::vector> &&headers_) + : id_(id_) + , method_(std::move(method_)) + , url_(std::move(url_)) + , http_version_(std::move(http_version_)) + , headers_(std::move(headers_)) +{} + +const std::int32_t http_request::ID; + +object_ptr http_request::fetch(td::TlParser &p) { + return make_object(p); +} + +http_request::http_request(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : id_(TlFetchInt256::parse(p)) + , method_(TlFetchString::parse(p)) + , url_(TlFetchString::parse(p)) + , http_version_(TlFetchString::parse(p)) + , headers_(TlFetchVector>::parse(p)) +#undef FAIL +{} + +void http_request::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + s.store_binary(1639027169); + TlStoreBinary::store(id_, s); + TlStoreString::store(method_, s); + TlStoreString::store(url_, s); + TlStoreString::store(http_version_, s); + TlStoreVector::store(headers_, s); +} + +void http_request::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + s.store_binary(1639027169); + TlStoreBinary::store(id_, s); + TlStoreString::store(method_, s); + TlStoreString::store(url_, s); + TlStoreString::store(http_version_, s); + TlStoreVector::store(headers_, s); +} + +void http_request::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "http_request"); + s.store_field("id", id_); + s.store_field("method", method_); + s.store_field("url", url_); + s.store_field("http_version", http_version_); + { const std::vector> &v = headers_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("headers", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_class_end(); + } +} + +http_request::ReturnType http_request::fetch_result(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return ReturnType() + return TlFetchBoxed, -273307789>::parse(p); +#undef FAIL +} + overlay_getBroadcast::overlay_getBroadcast() : hash_() {} @@ -15924,6 +16855,110 @@ tonNode_downloadZeroState::ReturnType tonNode_downloadZeroState::fetch_result(td #undef FAIL } +tonNode_getArchiveInfo::tonNode_getArchiveInfo() + : masterchain_seqno_() +{} + +tonNode_getArchiveInfo::tonNode_getArchiveInfo(std::int32_t masterchain_seqno_) + : masterchain_seqno_(masterchain_seqno_) +{} + +const std::int32_t tonNode_getArchiveInfo::ID; + +object_ptr tonNode_getArchiveInfo::fetch(td::TlParser &p) { + return make_object(p); +} + +tonNode_getArchiveInfo::tonNode_getArchiveInfo(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : masterchain_seqno_(TlFetchInt::parse(p)) +#undef FAIL +{} + +void tonNode_getArchiveInfo::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + s.store_binary(2066602305); + TlStoreBinary::store(masterchain_seqno_, s); +} + +void tonNode_getArchiveInfo::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + s.store_binary(2066602305); + TlStoreBinary::store(masterchain_seqno_, s); +} + +void tonNode_getArchiveInfo::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tonNode_getArchiveInfo"); + s.store_field("masterchain_seqno", masterchain_seqno_); + s.store_class_end(); + } +} + +tonNode_getArchiveInfo::ReturnType tonNode_getArchiveInfo::fetch_result(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return ReturnType() + return TlFetchObject::parse(p); +#undef FAIL +} + +tonNode_getArchiveSlice::tonNode_getArchiveSlice() + : archive_id_() + , offset_() + , max_size_() +{} + +tonNode_getArchiveSlice::tonNode_getArchiveSlice(std::int64_t archive_id_, std::int64_t offset_, std::int32_t max_size_) + : archive_id_(archive_id_) + , offset_(offset_) + , max_size_(max_size_) +{} + +const std::int32_t tonNode_getArchiveSlice::ID; + +object_ptr tonNode_getArchiveSlice::fetch(td::TlParser &p) { + return make_object(p); +} + +tonNode_getArchiveSlice::tonNode_getArchiveSlice(td::TlParser &p) +#define FAIL(error) p.set_error(error) + : archive_id_(TlFetchLong::parse(p)) + , offset_(TlFetchLong::parse(p)) + , max_size_(TlFetchInt::parse(p)) +#undef FAIL +{} + +void tonNode_getArchiveSlice::store(td::TlStorerCalcLength &s) const { + (void)sizeof(s); + s.store_binary(540758376); + TlStoreBinary::store(archive_id_, s); + TlStoreBinary::store(offset_, s); + TlStoreBinary::store(max_size_, s); +} + +void tonNode_getArchiveSlice::store(td::TlStorerUnsafe &s) const { + (void)sizeof(s); + s.store_binary(540758376); + TlStoreBinary::store(archive_id_, s); + TlStoreBinary::store(offset_, s); + TlStoreBinary::store(max_size_, s); +} + +void tonNode_getArchiveSlice::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tonNode_getArchiveSlice"); + s.store_field("archive_id", archive_id_); + s.store_field("offset", offset_); + s.store_field("max_size", max_size_); + s.store_class_end(); + } +} + +tonNode_getArchiveSlice::ReturnType tonNode_getArchiveSlice::fetch_result(td::TlParser &p) { +#define FAIL(error) p.set_error(error); return ReturnType() + return TlFetchBoxed, 1443505284>::parse(p); +#undef FAIL +} + tonNode_getCapabilities::tonNode_getCapabilities() { } diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h index 8bf7d8ff9b..6187d3f427 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.h @@ -140,6 +140,14 @@ class db_filedb_Key; class db_filedb_value; +class db_files_Key; + +class db_files_index_value; + +class db_files_package_firstBlock; + +class db_files_package_value; + class db_lt_Key; class db_lt_desc_value; @@ -158,6 +166,8 @@ class db_root_Key; class db_state_asyncSerializer; +class db_state_dbVersion; + class db_state_destroyedSessions; class db_state_gcBlockId; @@ -258,6 +268,18 @@ class engine_validator_time; class fec_Type; +class http_header; + +class http_payloadPart; + +class http_response; + +class http_server_config; + +class http_server_dnsEntry; + +class http_server_host; + class id_config_local; class liteclient_config_global; @@ -304,6 +326,8 @@ class tcp_pong; class ton_BlockId; +class tonNode_ArchiveInfo; + class tonNode_BlockDescription; class tonNode_blockId; @@ -2362,11 +2386,12 @@ class db_block_info final : public db_block_Info { std::int64_t lt_; std::int32_t ts_; td::Bits256 state_; - enum Flags : std::int32_t {PREV_LEFT_MASK = 2, PREV_RIGHT_MASK = 4, NEXT_LEFT_MASK = 8, NEXT_RIGHT_MASK = 16, LT_MASK = 8192, TS_MASK = 16384, STATE_MASK = 131072}; + std::int32_t masterchain_ref_seqno_; + enum Flags : std::int32_t {PREV_LEFT_MASK = 2, PREV_RIGHT_MASK = 4, NEXT_LEFT_MASK = 8, NEXT_RIGHT_MASK = 16, LT_MASK = 8192, TS_MASK = 16384, STATE_MASK = 131072, MASTERCHAIN_REF_SEQNO_MASK = 8388608}; db_block_info(); - db_block_info(object_ptr &&id_, std::int32_t flags_, object_ptr &&prev_left_, object_ptr &&prev_right_, object_ptr &&next_left_, object_ptr &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_); + db_block_info(object_ptr &&id_, std::int32_t flags_, object_ptr &&prev_left_, object_ptr &&prev_right_, object_ptr &&next_left_, object_ptr &&next_right_, std::int64_t lt_, std::int32_t ts_, td::Bits256 const &state_, std::int32_t masterchain_ref_seqno_); static const std::int32_t ID = 1254549287; std::int32_t get_id() const final { @@ -2811,6 +2836,30 @@ class db_filedb_key_candidate final : public db_filedb_Key { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class db_filedb_key_blockInfo final : public db_filedb_Key { + public: + object_ptr block_id_; + + db_filedb_key_blockInfo(); + + explicit db_filedb_key_blockInfo(object_ptr &&block_id_); + + static const std::int32_t ID = -996551428; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_filedb_key_blockInfo(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class db_filedb_value final : public Object { public: object_ptr key_; @@ -2838,6 +2887,141 @@ class db_filedb_value final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class db_files_Key: public Object { + public: + + static object_ptr fetch(td::TlParser &p); +}; + +class db_files_index_key final : public db_files_Key { + public: + + db_files_index_key(); + + static const std::int32_t ID = 2109998338; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_files_index_key(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class db_files_package_key final : public db_files_Key { + public: + std::int32_t package_id_; + bool key_; + bool temp_; + + db_files_package_key(); + + db_files_package_key(std::int32_t package_id_, bool key_, bool temp_); + + static const std::int32_t ID = -1526463682; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_files_package_key(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class db_files_index_value final : public Object { + public: + std::vector packages_; + std::vector key_packages_; + std::vector temp_packages_; + + db_files_index_value(); + + db_files_index_value(std::vector &&packages_, std::vector &&key_packages_, std::vector &&temp_packages_); + + static const std::int32_t ID = -1565402372; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_files_index_value(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class db_files_package_firstBlock final : public Object { + public: + std::int32_t workchain_; + std::int64_t shard_; + std::int32_t seqno_; + std::int32_t unixtime_; + std::int64_t lt_; + + db_files_package_firstBlock(); + + db_files_package_firstBlock(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::int32_t unixtime_, std::int64_t lt_); + + static const std::int32_t ID = 1880254951; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_files_package_firstBlock(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class db_files_package_value final : public Object { + public: + std::int32_t package_id_; + bool key_; + bool temp_; + std::vector> firstblocks_; + bool deleted_; + + db_files_package_value(); + + db_files_package_value(std::int32_t package_id_, bool key_, bool temp_, std::vector> &&firstblocks_, bool deleted_); + + static const std::int32_t ID = -464726741; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_files_package_value(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class db_lt_Key: public Object { public: @@ -3195,6 +3379,30 @@ class db_state_asyncSerializer final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class db_state_dbVersion final : public Object { + public: + std::int32_t version_; + + db_state_dbVersion(); + + explicit db_state_dbVersion(std::int32_t version_); + + static const std::int32_t ID = -650698505; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_state_dbVersion(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class db_state_destroyedSessions final : public Object { public: std::vector sessions_; @@ -3423,6 +3631,27 @@ class db_state_key_hardforks final : public db_state_Key { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class db_state_key_dbVersion final : public db_state_Key { + public: + + db_state_key_dbVersion(); + + static const std::int32_t ID = 1917788500; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit db_state_key_dbVersion(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class db_state_shardClient final : public Object { public: object_ptr block_; @@ -4751,6 +4980,161 @@ class fec_online final : public fec_Type { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class http_header final : public Object { + public: + std::string name_; + std::string value_; + + http_header(); + + http_header(std::string const &name_, std::string const &value_); + + static const std::int32_t ID = -1902385903; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit http_header(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class http_payloadPart final : public Object { + public: + td::BufferSlice data_; + std::vector> trailer_; + bool last_; + + http_payloadPart(); + + http_payloadPart(td::BufferSlice &&data_, std::vector> &&trailer_, bool last_); + + static const std::int32_t ID = 693819236; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit http_payloadPart(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class http_response final : public Object { + public: + std::string http_version_; + std::int32_t status_code_; + std::string reason_; + std::vector> headers_; + + http_response(); + + http_response(std::string const &http_version_, std::int32_t status_code_, std::string const &reason_, std::vector> &&headers_); + + static const std::int32_t ID = -273307789; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit http_response(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class http_server_config final : public Object { + public: + std::vector> dhs_; + std::vector> local_hosts_; + + http_server_config(); + + http_server_config(std::vector> &&dhs_, std::vector> &&local_hosts_); + + static const std::int32_t ID = 974419964; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit http_server_config(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class http_server_dnsEntry final : public Object { + public: + std::string domain_; + object_ptr addr_; + + http_server_dnsEntry(); + + http_server_dnsEntry(std::string const &domain_, object_ptr &&addr_); + + static const std::int32_t ID = -663592810; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit http_server_dnsEntry(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class http_server_host final : public Object { + public: + std::vector domains_; + std::int32_t ip_; + std::int32_t port_; + object_ptr adnl_id_; + + http_server_host(); + + http_server_host(std::vector &&domains_, std::int32_t ip_, std::int32_t port_, object_ptr &&adnl_id_); + + static const std::int32_t ID = -981605721; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit http_server_host(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class id_config_local final : public Object { public: object_ptr id_; @@ -5759,6 +6143,57 @@ class ton_blockIdApprove final : public ton_BlockId { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class tonNode_ArchiveInfo: public Object { + public: + + static object_ptr fetch(td::TlParser &p); +}; + +class tonNode_archiveNotFound final : public tonNode_ArchiveInfo { + public: + + tonNode_archiveNotFound(); + + static const std::int32_t ID = -1725360509; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit tonNode_archiveNotFound(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class tonNode_archiveInfo final : public tonNode_ArchiveInfo { + public: + std::int64_t id_; + + tonNode_archiveInfo(); + + explicit tonNode_archiveInfo(std::int64_t id_); + + static const std::int32_t ID = 435158924; + std::int32_t get_id() const final { + return ID; + } + + static object_ptr fetch(td::TlParser &p); + + explicit tonNode_archiveInfo(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class tonNode_BlockDescription: public Object { public: @@ -8300,6 +8735,68 @@ class getTestObject final : public Function { static ReturnType fetch_result(td::TlParser &p); }; +class http_getNextPayloadPart final : public Function { + public: + td::Bits256 id_; + std::int32_t seqno_; + std::int32_t max_chunk_size_; + + http_getNextPayloadPart(); + + http_getNextPayloadPart(td::Bits256 const &id_, std::int32_t seqno_, std::int32_t max_chunk_size_); + + static const std::int32_t ID = -1871422196; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + static object_ptr fetch(td::TlParser &p); + + explicit http_getNextPayloadPart(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; + + static ReturnType fetch_result(td::TlParser &p); +}; + +class http_request final : public Function { + public: + td::Bits256 id_; + std::string method_; + std::string url_; + std::string http_version_; + std::vector> headers_; + + http_request(); + + http_request(td::Bits256 const &id_, std::string const &method_, std::string const &url_, std::string const &http_version_, std::vector> &&headers_); + + static const std::int32_t ID = 1639027169; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + static object_ptr fetch(td::TlParser &p); + + explicit http_request(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; + + static ReturnType fetch_result(td::TlParser &p); +}; + class overlay_getBroadcast final : public Function { public: td::Bits256 hash_; @@ -8752,6 +9249,64 @@ class tonNode_downloadZeroState final : public Function { static ReturnType fetch_result(td::TlParser &p); }; +class tonNode_getArchiveInfo final : public Function { + public: + std::int32_t masterchain_seqno_; + + tonNode_getArchiveInfo(); + + explicit tonNode_getArchiveInfo(std::int32_t masterchain_seqno_); + + static const std::int32_t ID = 2066602305; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + static object_ptr fetch(td::TlParser &p); + + explicit tonNode_getArchiveInfo(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; + + static ReturnType fetch_result(td::TlParser &p); +}; + +class tonNode_getArchiveSlice final : public Function { + public: + std::int64_t archive_id_; + std::int64_t offset_; + std::int32_t max_size_; + + tonNode_getArchiveSlice(); + + tonNode_getArchiveSlice(std::int64_t archive_id_, std::int64_t offset_, std::int32_t max_size_); + + static const std::int32_t ID = 540758376; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + static object_ptr fetch(td::TlParser &p); + + explicit tonNode_getArchiveSlice(td::TlParser &p); + + void store(td::TlStorerCalcLength &s) const final; + + void store(td::TlStorerUnsafe &s) const final; + + void store(td::TlStorerToString &s, const char *field_name) const final; + + static ReturnType fetch_result(td::TlParser &p); +}; + class tonNode_getCapabilities final : public Function { public: diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp index 9216c063dc..e4df697cbd 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api.hpp @@ -296,9 +296,27 @@ bool downcast_call(Object &obj, const T &func) { case db_filedb_key_candidate::ID: func(static_cast(obj)); return true; + case db_filedb_key_blockInfo::ID: + func(static_cast(obj)); + return true; case db_filedb_value::ID: func(static_cast(obj)); return true; + case db_files_index_key::ID: + func(static_cast(obj)); + return true; + case db_files_package_key::ID: + func(static_cast(obj)); + return true; + case db_files_index_value::ID: + func(static_cast(obj)); + return true; + case db_files_package_firstBlock::ID: + func(static_cast(obj)); + return true; + case db_files_package_value::ID: + func(static_cast(obj)); + return true; case db_lt_el_key::ID: func(static_cast(obj)); return true; @@ -341,6 +359,9 @@ bool downcast_call(Object &obj, const T &func) { case db_state_asyncSerializer::ID: func(static_cast(obj)); return true; + case db_state_dbVersion::ID: + func(static_cast(obj)); + return true; case db_state_destroyedSessions::ID: func(static_cast(obj)); return true; @@ -371,6 +392,9 @@ bool downcast_call(Object &obj, const T &func) { case db_state_key_hardforks::ID: func(static_cast(obj)); return true; + case db_state_key_dbVersion::ID: + func(static_cast(obj)); + return true; case db_state_shardClient::ID: func(static_cast(obj)); return true; @@ -527,6 +551,24 @@ bool downcast_call(Object &obj, const T &func) { case fec_online::ID: func(static_cast(obj)); return true; + case http_header::ID: + func(static_cast(obj)); + return true; + case http_payloadPart::ID: + func(static_cast(obj)); + return true; + case http_response::ID: + func(static_cast(obj)); + return true; + case http_server_config::ID: + func(static_cast(obj)); + return true; + case http_server_dnsEntry::ID: + func(static_cast(obj)); + return true; + case http_server_host::ID: + func(static_cast(obj)); + return true; case id_config_local::ID: func(static_cast(obj)); return true; @@ -641,6 +683,12 @@ bool downcast_call(Object &obj, const T &func) { case ton_blockIdApprove::ID: func(static_cast(obj)); return true; + case tonNode_archiveNotFound::ID: + func(static_cast(obj)); + return true; + case tonNode_archiveInfo::ID: + func(static_cast(obj)); + return true; case tonNode_blockDescriptionEmpty::ID: func(static_cast(obj)); return true; @@ -937,6 +985,12 @@ bool downcast_call(Function &obj, const T &func) { case getTestObject::ID: func(static_cast(obj)); return true; + case http_getNextPayloadPart::ID: + func(static_cast(obj)); + return true; + case http_request::ID: + func(static_cast(obj)); + return true; case overlay_getBroadcast::ID: func(static_cast(obj)); return true; @@ -985,6 +1039,12 @@ bool downcast_call(Function &obj, const T &func) { case tonNode_downloadZeroState::ID: func(static_cast(obj)); return true; + case tonNode_getArchiveInfo::ID: + func(static_cast(obj)); + return true; + case tonNode_getArchiveSlice::ID: + func(static_cast(obj)); + return true; case tonNode_getCapabilities::ID: func(static_cast(obj)); return true; @@ -1407,6 +1467,29 @@ bool downcast_call(db_filedb_Key &obj, const T &func) { case db_filedb_key_candidate::ID: func(static_cast(obj)); return true; + case db_filedb_key_blockInfo::ID: + func(static_cast(obj)); + return true; + default: + return false; + } +} + +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(db_files_Key &obj, const T &func) { + switch (obj.get_id()) { + case db_files_index_key::ID: + func(static_cast(obj)); + return true; + case db_files_package_key::ID: + func(static_cast(obj)); + return true; default: return false; } @@ -1488,6 +1571,9 @@ bool downcast_call(db_state_Key &obj, const T &func) { case db_state_key_hardforks::ID: func(static_cast(obj)); return true; + case db_state_key_dbVersion::ID: + func(static_cast(obj)); + return true; default: return false; } @@ -1763,6 +1849,26 @@ bool downcast_call(ton_BlockId &obj, const T &func) { } } +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(tonNode_ArchiveInfo &obj, const T &func) { + switch (obj.get_id()) { + case tonNode_archiveNotFound::ID: + func(static_cast(obj)); + return true; + case tonNode_archiveInfo::ID: + func(static_cast(obj)); + return true; + default: + return false; + } +} + /** * Calls specified function object with the specified object downcasted to the most-derived type. * \param[in] obj Object to pass as an argument to the function object. diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp index dde2c4fd45..9cf8386668 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.cpp @@ -188,7 +188,19 @@ Result tl_constructor_from_string(ton_api::db_filedb_Key *object, const s {"db.filedb.key.proof", -627749396}, {"db.filedb.key.proofLink", -1728330290}, {"db.filedb.key.signatures", -685175541}, - {"db.filedb.key.candidate", -494269767} + {"db.filedb.key.candidate", -494269767}, + {"db.filedb.key.blockInfo", -996551428} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} +Result tl_constructor_from_string(ton_api::db_files_Key *object, const std::string &str) { + static const std::unordered_map m = { + {"db.files.index.key", 2109998338}, + {"db.files.package.key", -1526463682} }; auto it = m.find(str); if (it == m.end()) { @@ -228,7 +240,8 @@ Result tl_constructor_from_string(ton_api::db_state_Key *object, const st {"db.state.key.gcBlockId", -1015417890}, {"db.state.key.shardClient", -912576121}, {"db.state.key.asyncSerializer", 699304479}, - {"db.state.key.hardforks", -420206662} + {"db.state.key.hardforks", -420206662}, + {"db.state.key.dbVersion", 1917788500} }; auto it = m.find(str); if (it == m.end()) { @@ -378,6 +391,17 @@ Result tl_constructor_from_string(ton_api::ton_BlockId *object, const std } return it->second; } +Result tl_constructor_from_string(ton_api::tonNode_ArchiveInfo *object, const std::string &str) { + static const std::unordered_map m = { + {"tonNode.archiveNotFound", -1725360509}, + {"tonNode.archiveInfo", 435158924} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} Result tl_constructor_from_string(ton_api::tonNode_BlockDescription *object, const std::string &str) { static const std::unordered_map m = { {"tonNode.blockDescriptionEmpty", -2088456555}, @@ -593,7 +617,13 @@ Result tl_constructor_from_string(ton_api::Object *object, const std::str {"db.filedb.key.proofLink", -1728330290}, {"db.filedb.key.signatures", -685175541}, {"db.filedb.key.candidate", -494269767}, + {"db.filedb.key.blockInfo", -996551428}, {"db.filedb.value", -220390867}, + {"db.files.index.key", 2109998338}, + {"db.files.package.key", -1526463682}, + {"db.files.index.value", -1565402372}, + {"db.files.package.firstBlock", 1880254951}, + {"db.files.package.value", -464726741}, {"db.lt.el.key", -1523442974}, {"db.lt.desc.key", -236722287}, {"db.lt.shard.key", 1353120015}, @@ -608,6 +638,7 @@ Result tl_constructor_from_string(ton_api::Object *object, const std::str {"db.root.key.blockDb", 806534976}, {"db.root.key.config", 331559556}, {"db.state.asyncSerializer", -751883871}, + {"db.state.dbVersion", -650698505}, {"db.state.destroyedSessions", -1381443196}, {"db.state.gcBlockId", -550453937}, {"db.state.hardforks", -2047668988}, @@ -618,6 +649,7 @@ Result tl_constructor_from_string(ton_api::Object *object, const std::str {"db.state.key.shardClient", -912576121}, {"db.state.key.asyncSerializer", 699304479}, {"db.state.key.hardforks", -420206662}, + {"db.state.key.dbVersion", 1917788500}, {"db.state.shardClient", 186033821}, {"dht.key", -160964977}, {"dht.keyDescription", 673009157}, @@ -670,6 +702,12 @@ Result tl_constructor_from_string(ton_api::Object *object, const std::str {"fec.raptorQ", -1953257504}, {"fec.roundRobin", 854927588}, {"fec.online", 19359244}, + {"http.header", -1902385903}, + {"http.payloadPart", 693819236}, + {"http.response", -273307789}, + {"http.server.config", 974419964}, + {"http.server.dnsEntry", -663592810}, + {"http.server.host", -981605721}, {"id.config.local", -1834367090}, {"liteclient.config.global", 143507704}, {"liteserver.desc", -1001806732}, @@ -708,6 +746,8 @@ Result tl_constructor_from_string(ton_api::Object *object, const std::str {"tcp.pong", -597034237}, {"ton.blockId", -989106576}, {"ton.blockIdApprove", 768887369}, + {"tonNode.archiveNotFound", -1725360509}, + {"tonNode.archiveInfo", 435158924}, {"tonNode.blockDescriptionEmpty", -2088456555}, {"tonNode.blockDescription", 1185009800}, {"tonNode.blockId", -1211256473}, @@ -811,6 +851,8 @@ Result tl_constructor_from_string(ton_api::Function *object, const std::s {"engine.validator.setVerbosity", -1316856190}, {"engine.validator.sign", 451549736}, {"getTestObject", 197109379}, + {"http.getNextPayloadPart", -1871422196}, + {"http.request", 1639027169}, {"overlay.getBroadcast", 758510240}, {"overlay.getBroadcastList", 1109141562}, {"overlay.getRandomPeers", 1223582891}, @@ -827,6 +869,8 @@ Result tl_constructor_from_string(ton_api::Function *object, const std::s {"tonNode.downloadPersistentState", 2140791736}, {"tonNode.downloadPersistentStateSlice", -169220381}, {"tonNode.downloadZeroState", -1379131814}, + {"tonNode.getArchiveInfo", 2066602305}, + {"tonNode.getArchiveSlice", 540758376}, {"tonNode.getCapabilities", -555345672}, {"tonNode.getNextBlockDescription", 341160179}, {"tonNode.getNextBlocksDescription", 1059590852}, @@ -2116,6 +2160,12 @@ Status from_json(ton_api::db_block_info &to, JsonObject &from) { TRY_STATUS(from_json(to.state_, value)); } } + { + TRY_RESULT(value, get_json_object_field(from, "masterchain_ref_seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.masterchain_ref_seqno_, value)); + } + } return Status::OK(); } Status from_json(ton_api::db_block_packedInfo &to, JsonObject &from) { @@ -2343,6 +2393,15 @@ Status from_json(ton_api::db_filedb_key_candidate &to, JsonObject &from) { } return Status::OK(); } +Status from_json(ton_api::db_filedb_key_blockInfo &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "block_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.block_id_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::db_filedb_value &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true)); @@ -2370,6 +2429,117 @@ Status from_json(ton_api::db_filedb_value &to, JsonObject &from) { } return Status::OK(); } +Status from_json(ton_api::db_files_index_key &to, JsonObject &from) { + return Status::OK(); +} +Status from_json(ton_api::db_files_package_key &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "package_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.package_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "temp", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.temp_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::db_files_index_value &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "packages", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.packages_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "key_packages", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.key_packages_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "temp_packages", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.temp_packages_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::db_files_package_firstBlock &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.workchain_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "shard", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.shard_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "unixtime", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.unixtime_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "lt", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.lt_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::db_files_package_value &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "package_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.package_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "temp", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.temp_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "firstblocks", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.firstblocks_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "deleted", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.deleted_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::db_lt_el_key &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true)); @@ -2574,6 +2744,15 @@ Status from_json(ton_api::db_state_asyncSerializer &to, JsonObject &from) { } return Status::OK(); } +Status from_json(ton_api::db_state_dbVersion &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "version", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.version_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::db_state_destroyedSessions &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "sessions", JsonValue::Type::Null, true)); @@ -2628,6 +2807,9 @@ Status from_json(ton_api::db_state_key_asyncSerializer &to, JsonObject &from) { Status from_json(ton_api::db_state_key_hardforks &to, JsonObject &from) { return Status::OK(); } +Status from_json(ton_api::db_state_key_dbVersion &to, JsonObject &from) { + return Status::OK(); +} Status from_json(ton_api::db_state_shardClient &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "block", JsonValue::Type::Null, true)); @@ -3456,6 +3638,126 @@ Status from_json(ton_api::fec_online &to, JsonObject &from) { } return Status::OK(); } +Status from_json(ton_api::http_header &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.name_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "value", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.value_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::http_payloadPart &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.data_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "trailer", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.trailer_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "last", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.last_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::http_response &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "http_version", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.http_version_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "status_code", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.status_code_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "reason", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.reason_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "headers", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.headers_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::http_server_config &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "dhs", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.dhs_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "local_hosts", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.local_hosts_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::http_server_dnsEntry &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "domain", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.domain_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "addr", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.addr_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::http_server_host &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "domains", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.domains_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "ip", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.ip_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "port", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.port_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "adnl_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.adnl_id_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::id_config_local &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true)); @@ -4146,6 +4448,18 @@ Status from_json(ton_api::ton_blockIdApprove &to, JsonObject &from) { } return Status::OK(); } +Status from_json(ton_api::tonNode_archiveNotFound &to, JsonObject &from) { + return Status::OK(); +} +Status from_json(ton_api::tonNode_archiveInfo &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.id_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::tonNode_blockDescriptionEmpty &to, JsonObject &from) { return Status::OK(); } @@ -5550,6 +5864,60 @@ Status from_json(ton_api::engine_validator_sign &to, JsonObject &from) { Status from_json(ton_api::getTestObject &to, JsonObject &from) { return Status::OK(); } +Status from_json(ton_api::http_getNextPayloadPart &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "max_chunk_size", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.max_chunk_size_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::http_request &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "method", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.method_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "url", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.url_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "http_version", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.http_version_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "headers", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.headers_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::overlay_getBroadcast &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "hash", JsonValue::Type::Null, true)); @@ -5718,6 +6086,36 @@ Status from_json(ton_api::tonNode_downloadZeroState &to, JsonObject &from) { } return Status::OK(); } +Status from_json(ton_api::tonNode_getArchiveInfo &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "masterchain_seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.masterchain_seqno_, value)); + } + } + return Status::OK(); +} +Status from_json(ton_api::tonNode_getArchiveSlice &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "archive_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.archive_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "offset", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.offset_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "max_size", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.max_size_, value)); + } + } + return Status::OK(); +} Status from_json(ton_api::tonNode_getCapabilities &to, JsonObject &from) { return Status::OK(); } @@ -6468,6 +6866,7 @@ void to_json(JsonValueScope &jv, const ton_api::db_block_info &object) { jo << ctie("lt", ToJson(JsonInt64{object.lt_})); jo << ctie("ts", ToJson(object.ts_)); jo << ctie("state", ToJson(object.state_)); + jo << ctie("masterchain_ref_seqno", ToJson(object.masterchain_ref_seqno_)); } void to_json(JsonValueScope &jv, const ton_api::db_block_packedInfo &object) { auto jo = jv.enter_object(); @@ -6610,6 +7009,13 @@ void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_candidate &object) jo << ctie("id", ToJson(object.id_)); } } +void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_blockInfo &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.filedb.key.blockInfo"); + if (object.block_id_) { + jo << ctie("block_id", ToJson(object.block_id_)); + } +} void to_json(JsonValueScope &jv, const ton_api::db_filedb_value &object) { auto jo = jv.enter_object(); jo << ctie("@type", "db.filedb.value"); @@ -6620,6 +7026,45 @@ void to_json(JsonValueScope &jv, const ton_api::db_filedb_value &object) { jo << ctie("next", ToJson(object.next_)); jo << ctie("file_hash", ToJson(object.file_hash_)); } +void to_json(JsonValueScope &jv, const ton_api::db_files_Key &object) { + ton_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const ton_api::db_files_index_key &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.files.index.key"); +} +void to_json(JsonValueScope &jv, const ton_api::db_files_package_key &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.files.package.key"); + jo << ctie("package_id", ToJson(object.package_id_)); + jo << ctie("key", ToJson(object.key_)); + jo << ctie("temp", ToJson(object.temp_)); +} +void to_json(JsonValueScope &jv, const ton_api::db_files_index_value &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.files.index.value"); + jo << ctie("packages", ToJson(object.packages_)); + jo << ctie("key_packages", ToJson(object.key_packages_)); + jo << ctie("temp_packages", ToJson(object.temp_packages_)); +} +void to_json(JsonValueScope &jv, const ton_api::db_files_package_firstBlock &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.files.package.firstBlock"); + jo << ctie("workchain", ToJson(object.workchain_)); + jo << ctie("shard", ToJson(JsonInt64{object.shard_})); + jo << ctie("seqno", ToJson(object.seqno_)); + jo << ctie("unixtime", ToJson(object.unixtime_)); + jo << ctie("lt", ToJson(JsonInt64{object.lt_})); +} +void to_json(JsonValueScope &jv, const ton_api::db_files_package_value &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.files.package.value"); + jo << ctie("package_id", ToJson(object.package_id_)); + jo << ctie("key", ToJson(object.key_)); + jo << ctie("temp", ToJson(object.temp_)); + jo << ctie("firstblocks", ToJson(object.firstblocks_)); + jo << ctie("deleted", ToJson(object.deleted_)); +} void to_json(JsonValueScope &jv, const ton_api::db_lt_Key &object) { ton_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); } @@ -6717,6 +7162,11 @@ void to_json(JsonValueScope &jv, const ton_api::db_state_asyncSerializer &object } jo << ctie("last_ts", ToJson(object.last_ts_)); } +void to_json(JsonValueScope &jv, const ton_api::db_state_dbVersion &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.state.dbVersion"); + jo << ctie("version", ToJson(object.version_)); +} void to_json(JsonValueScope &jv, const ton_api::db_state_destroyedSessions &object) { auto jo = jv.enter_object(); jo << ctie("@type", "db.state.destroyedSessions"); @@ -6768,6 +7218,10 @@ void to_json(JsonValueScope &jv, const ton_api::db_state_key_hardforks &object) auto jo = jv.enter_object(); jo << ctie("@type", "db.state.key.hardforks"); } +void to_json(JsonValueScope &jv, const ton_api::db_state_key_dbVersion &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "db.state.key.dbVersion"); +} void to_json(JsonValueScope &jv, const ton_api::db_state_shardClient &object) { auto jo = jv.enter_object(); jo << ctie("@type", "db.state.shardClient"); @@ -7139,6 +7593,51 @@ void to_json(JsonValueScope &jv, const ton_api::fec_online &object) { jo << ctie("symbol_size", ToJson(object.symbol_size_)); jo << ctie("symbols_count", ToJson(object.symbols_count_)); } +void to_json(JsonValueScope &jv, const ton_api::http_header &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.header"); + jo << ctie("name", ToJson(object.name_)); + jo << ctie("value", ToJson(object.value_)); +} +void to_json(JsonValueScope &jv, const ton_api::http_payloadPart &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.payloadPart"); + jo << ctie("data", ToJson(JsonBytes{object.data_})); + jo << ctie("trailer", ToJson(object.trailer_)); + jo << ctie("last", ToJson(object.last_)); +} +void to_json(JsonValueScope &jv, const ton_api::http_response &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.response"); + jo << ctie("http_version", ToJson(object.http_version_)); + jo << ctie("status_code", ToJson(object.status_code_)); + jo << ctie("reason", ToJson(object.reason_)); + jo << ctie("headers", ToJson(object.headers_)); +} +void to_json(JsonValueScope &jv, const ton_api::http_server_config &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.server.config"); + jo << ctie("dhs", ToJson(object.dhs_)); + jo << ctie("local_hosts", ToJson(object.local_hosts_)); +} +void to_json(JsonValueScope &jv, const ton_api::http_server_dnsEntry &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.server.dnsEntry"); + jo << ctie("domain", ToJson(object.domain_)); + if (object.addr_) { + jo << ctie("addr", ToJson(object.addr_)); + } +} +void to_json(JsonValueScope &jv, const ton_api::http_server_host &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.server.host"); + jo << ctie("domains", ToJson(object.domains_)); + jo << ctie("ip", ToJson(object.ip_)); + jo << ctie("port", ToJson(object.port_)); + if (object.adnl_id_) { + jo << ctie("adnl_id", ToJson(object.adnl_id_)); + } +} void to_json(JsonValueScope &jv, const ton_api::id_config_local &object) { auto jo = jv.enter_object(); jo << ctie("@type", "id.config.local"); @@ -7442,6 +7941,18 @@ void to_json(JsonValueScope &jv, const ton_api::ton_blockIdApprove &object) { jo << ctie("root_cell_hash", ToJson(object.root_cell_hash_)); jo << ctie("file_hash", ToJson(object.file_hash_)); } +void to_json(JsonValueScope &jv, const ton_api::tonNode_ArchiveInfo &object) { + ton_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveNotFound &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tonNode.archiveNotFound"); +} +void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveInfo &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tonNode.archiveInfo"); + jo << ctie("id", ToJson(JsonInt64{object.id_})); +} void to_json(JsonValueScope &jv, const ton_api::tonNode_BlockDescription &object) { ton_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); } @@ -8065,6 +8576,22 @@ void to_json(JsonValueScope &jv, const ton_api::getTestObject &object) { auto jo = jv.enter_object(); jo << ctie("@type", "getTestObject"); } +void to_json(JsonValueScope &jv, const ton_api::http_getNextPayloadPart &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.getNextPayloadPart"); + jo << ctie("id", ToJson(object.id_)); + jo << ctie("seqno", ToJson(object.seqno_)); + jo << ctie("max_chunk_size", ToJson(object.max_chunk_size_)); +} +void to_json(JsonValueScope &jv, const ton_api::http_request &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "http.request"); + jo << ctie("id", ToJson(object.id_)); + jo << ctie("method", ToJson(object.method_)); + jo << ctie("url", ToJson(object.url_)); + jo << ctie("http_version", ToJson(object.http_version_)); + jo << ctie("headers", ToJson(object.headers_)); +} void to_json(JsonValueScope &jv, const ton_api::overlay_getBroadcast &object) { auto jo = jv.enter_object(); jo << ctie("@type", "overlay.getBroadcast"); @@ -8173,6 +8700,18 @@ void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadZeroState &objec jo << ctie("block", ToJson(object.block_)); } } +void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveInfo &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tonNode.getArchiveInfo"); + jo << ctie("masterchain_seqno", ToJson(object.masterchain_seqno_)); +} +void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveSlice &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tonNode.getArchiveSlice"); + jo << ctie("archive_id", ToJson(JsonInt64{object.archive_id_})); + jo << ctie("offset", ToJson(JsonInt64{object.offset_})); + jo << ctie("max_size", ToJson(object.max_size_)); +} void to_json(JsonValueScope &jv, const ton_api::tonNode_getCapabilities &object) { auto jo = jv.enter_object(); jo << ctie("@type", "tonNode.getCapabilities"); diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h index b7fbcebbc5..d7cc42728f 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/ton_api_json.h @@ -24,6 +24,7 @@ Result tl_constructor_from_string(ton_api::catchain_block_inner_Data *obj Result tl_constructor_from_string(ton_api::db_block_Info *object, const std::string &str); Result tl_constructor_from_string(ton_api::db_blockdb_Key *object, const std::string &str); Result tl_constructor_from_string(ton_api::db_filedb_Key *object, const std::string &str); +Result tl_constructor_from_string(ton_api::db_files_Key *object, const std::string &str); Result tl_constructor_from_string(ton_api::db_lt_Key *object, const std::string &str); Result tl_constructor_from_string(ton_api::db_root_Key *object, const std::string &str); Result tl_constructor_from_string(ton_api::db_state_Key *object, const std::string &str); @@ -39,6 +40,7 @@ Result tl_constructor_from_string(ton_api::rldp_Message *object, const st Result tl_constructor_from_string(ton_api::rldp_MessagePart *object, const std::string &str); Result tl_constructor_from_string(ton_api::tcp_Message *object, const std::string &str); Result tl_constructor_from_string(ton_api::ton_BlockId *object, const std::string &str); +Result tl_constructor_from_string(ton_api::tonNode_ArchiveInfo *object, const std::string &str); Result tl_constructor_from_string(ton_api::tonNode_BlockDescription *object, const std::string &str); Result tl_constructor_from_string(ton_api::tonNode_Broadcast *object, const std::string &str); Result tl_constructor_from_string(ton_api::tonNode_DataFull *object, const std::string &str); @@ -145,7 +147,13 @@ Status from_json(ton_api::db_filedb_key_proof &to, JsonObject &from); Status from_json(ton_api::db_filedb_key_proofLink &to, JsonObject &from); Status from_json(ton_api::db_filedb_key_signatures &to, JsonObject &from); Status from_json(ton_api::db_filedb_key_candidate &to, JsonObject &from); +Status from_json(ton_api::db_filedb_key_blockInfo &to, JsonObject &from); Status from_json(ton_api::db_filedb_value &to, JsonObject &from); +Status from_json(ton_api::db_files_index_key &to, JsonObject &from); +Status from_json(ton_api::db_files_package_key &to, JsonObject &from); +Status from_json(ton_api::db_files_index_value &to, JsonObject &from); +Status from_json(ton_api::db_files_package_firstBlock &to, JsonObject &from); +Status from_json(ton_api::db_files_package_value &to, JsonObject &from); Status from_json(ton_api::db_lt_el_key &to, JsonObject &from); Status from_json(ton_api::db_lt_desc_key &to, JsonObject &from); Status from_json(ton_api::db_lt_shard_key &to, JsonObject &from); @@ -160,6 +168,7 @@ Status from_json(ton_api::db_root_key_cellDb &to, JsonObject &from); Status from_json(ton_api::db_root_key_blockDb &to, JsonObject &from); Status from_json(ton_api::db_root_key_config &to, JsonObject &from); Status from_json(ton_api::db_state_asyncSerializer &to, JsonObject &from); +Status from_json(ton_api::db_state_dbVersion &to, JsonObject &from); Status from_json(ton_api::db_state_destroyedSessions &to, JsonObject &from); Status from_json(ton_api::db_state_gcBlockId &to, JsonObject &from); Status from_json(ton_api::db_state_hardforks &to, JsonObject &from); @@ -170,6 +179,7 @@ Status from_json(ton_api::db_state_key_gcBlockId &to, JsonObject &from); Status from_json(ton_api::db_state_key_shardClient &to, JsonObject &from); Status from_json(ton_api::db_state_key_asyncSerializer &to, JsonObject &from); Status from_json(ton_api::db_state_key_hardforks &to, JsonObject &from); +Status from_json(ton_api::db_state_key_dbVersion &to, JsonObject &from); Status from_json(ton_api::db_state_shardClient &to, JsonObject &from); Status from_json(ton_api::dht_key &to, JsonObject &from); Status from_json(ton_api::dht_keyDescription &to, JsonObject &from); @@ -222,6 +232,12 @@ Status from_json(ton_api::engine_validator_time &to, JsonObject &from); Status from_json(ton_api::fec_raptorQ &to, JsonObject &from); Status from_json(ton_api::fec_roundRobin &to, JsonObject &from); Status from_json(ton_api::fec_online &to, JsonObject &from); +Status from_json(ton_api::http_header &to, JsonObject &from); +Status from_json(ton_api::http_payloadPart &to, JsonObject &from); +Status from_json(ton_api::http_response &to, JsonObject &from); +Status from_json(ton_api::http_server_config &to, JsonObject &from); +Status from_json(ton_api::http_server_dnsEntry &to, JsonObject &from); +Status from_json(ton_api::http_server_host &to, JsonObject &from); Status from_json(ton_api::id_config_local &to, JsonObject &from); Status from_json(ton_api::liteclient_config_global &to, JsonObject &from); Status from_json(ton_api::liteserver_desc &to, JsonObject &from); @@ -260,6 +276,8 @@ Status from_json(ton_api::tcp_authentificationComplete &to, JsonObject &from); Status from_json(ton_api::tcp_pong &to, JsonObject &from); Status from_json(ton_api::ton_blockId &to, JsonObject &from); Status from_json(ton_api::ton_blockIdApprove &to, JsonObject &from); +Status from_json(ton_api::tonNode_archiveNotFound &to, JsonObject &from); +Status from_json(ton_api::tonNode_archiveInfo &to, JsonObject &from); Status from_json(ton_api::tonNode_blockDescriptionEmpty &to, JsonObject &from); Status from_json(ton_api::tonNode_blockDescription &to, JsonObject &from); Status from_json(ton_api::tonNode_blockId &to, JsonObject &from); @@ -354,6 +372,8 @@ Status from_json(ton_api::engine_validator_importPrivateKey &to, JsonObject &fro Status from_json(ton_api::engine_validator_setVerbosity &to, JsonObject &from); Status from_json(ton_api::engine_validator_sign &to, JsonObject &from); Status from_json(ton_api::getTestObject &to, JsonObject &from); +Status from_json(ton_api::http_getNextPayloadPart &to, JsonObject &from); +Status from_json(ton_api::http_request &to, JsonObject &from); Status from_json(ton_api::overlay_getBroadcast &to, JsonObject &from); Status from_json(ton_api::overlay_getBroadcastList &to, JsonObject &from); Status from_json(ton_api::overlay_getRandomPeers &to, JsonObject &from); @@ -370,6 +390,8 @@ Status from_json(ton_api::tonNode_downloadNextBlockFull &to, JsonObject &from); Status from_json(ton_api::tonNode_downloadPersistentState &to, JsonObject &from); Status from_json(ton_api::tonNode_downloadPersistentStateSlice &to, JsonObject &from); Status from_json(ton_api::tonNode_downloadZeroState &to, JsonObject &from); +Status from_json(ton_api::tonNode_getArchiveInfo &to, JsonObject &from); +Status from_json(ton_api::tonNode_getArchiveSlice &to, JsonObject &from); Status from_json(ton_api::tonNode_getCapabilities &to, JsonObject &from); Status from_json(ton_api::tonNode_getNextBlockDescription &to, JsonObject &from); Status from_json(ton_api::tonNode_getNextBlocksDescription &to, JsonObject &from); @@ -492,7 +514,14 @@ void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_proof &object); void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_proofLink &object); void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_signatures &object); void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_candidate &object); +void to_json(JsonValueScope &jv, const ton_api::db_filedb_key_blockInfo &object); void to_json(JsonValueScope &jv, const ton_api::db_filedb_value &object); +void to_json(JsonValueScope &jv, const ton_api::db_files_Key &object); +void to_json(JsonValueScope &jv, const ton_api::db_files_index_key &object); +void to_json(JsonValueScope &jv, const ton_api::db_files_package_key &object); +void to_json(JsonValueScope &jv, const ton_api::db_files_index_value &object); +void to_json(JsonValueScope &jv, const ton_api::db_files_package_firstBlock &object); +void to_json(JsonValueScope &jv, const ton_api::db_files_package_value &object); void to_json(JsonValueScope &jv, const ton_api::db_lt_Key &object); void to_json(JsonValueScope &jv, const ton_api::db_lt_el_key &object); void to_json(JsonValueScope &jv, const ton_api::db_lt_desc_key &object); @@ -509,6 +538,7 @@ void to_json(JsonValueScope &jv, const ton_api::db_root_key_cellDb &object); void to_json(JsonValueScope &jv, const ton_api::db_root_key_blockDb &object); void to_json(JsonValueScope &jv, const ton_api::db_root_key_config &object); void to_json(JsonValueScope &jv, const ton_api::db_state_asyncSerializer &object); +void to_json(JsonValueScope &jv, const ton_api::db_state_dbVersion &object); void to_json(JsonValueScope &jv, const ton_api::db_state_destroyedSessions &object); void to_json(JsonValueScope &jv, const ton_api::db_state_gcBlockId &object); void to_json(JsonValueScope &jv, const ton_api::db_state_hardforks &object); @@ -520,6 +550,7 @@ void to_json(JsonValueScope &jv, const ton_api::db_state_key_gcBlockId &object); void to_json(JsonValueScope &jv, const ton_api::db_state_key_shardClient &object); void to_json(JsonValueScope &jv, const ton_api::db_state_key_asyncSerializer &object); void to_json(JsonValueScope &jv, const ton_api::db_state_key_hardforks &object); +void to_json(JsonValueScope &jv, const ton_api::db_state_key_dbVersion &object); void to_json(JsonValueScope &jv, const ton_api::db_state_shardClient &object); void to_json(JsonValueScope &jv, const ton_api::dht_key &object); void to_json(JsonValueScope &jv, const ton_api::dht_keyDescription &object); @@ -577,6 +608,12 @@ void to_json(JsonValueScope &jv, const ton_api::fec_Type &object); void to_json(JsonValueScope &jv, const ton_api::fec_raptorQ &object); void to_json(JsonValueScope &jv, const ton_api::fec_roundRobin &object); void to_json(JsonValueScope &jv, const ton_api::fec_online &object); +void to_json(JsonValueScope &jv, const ton_api::http_header &object); +void to_json(JsonValueScope &jv, const ton_api::http_payloadPart &object); +void to_json(JsonValueScope &jv, const ton_api::http_response &object); +void to_json(JsonValueScope &jv, const ton_api::http_server_config &object); +void to_json(JsonValueScope &jv, const ton_api::http_server_dnsEntry &object); +void to_json(JsonValueScope &jv, const ton_api::http_server_host &object); void to_json(JsonValueScope &jv, const ton_api::id_config_local &object); void to_json(JsonValueScope &jv, const ton_api::liteclient_config_global &object); void to_json(JsonValueScope &jv, const ton_api::liteserver_desc &object); @@ -622,6 +659,9 @@ void to_json(JsonValueScope &jv, const ton_api::tcp_pong &object); void to_json(JsonValueScope &jv, const ton_api::ton_BlockId &object); void to_json(JsonValueScope &jv, const ton_api::ton_blockId &object); void to_json(JsonValueScope &jv, const ton_api::ton_blockIdApprove &object); +void to_json(JsonValueScope &jv, const ton_api::tonNode_ArchiveInfo &object); +void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveNotFound &object); +void to_json(JsonValueScope &jv, const ton_api::tonNode_archiveInfo &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_BlockDescription &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_blockDescriptionEmpty &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_blockDescription &object); @@ -726,6 +766,8 @@ void to_json(JsonValueScope &jv, const ton_api::engine_validator_importPrivateKe void to_json(JsonValueScope &jv, const ton_api::engine_validator_setVerbosity &object); void to_json(JsonValueScope &jv, const ton_api::engine_validator_sign &object); void to_json(JsonValueScope &jv, const ton_api::getTestObject &object); +void to_json(JsonValueScope &jv, const ton_api::http_getNextPayloadPart &object); +void to_json(JsonValueScope &jv, const ton_api::http_request &object); void to_json(JsonValueScope &jv, const ton_api::overlay_getBroadcast &object); void to_json(JsonValueScope &jv, const ton_api::overlay_getBroadcastList &object); void to_json(JsonValueScope &jv, const ton_api::overlay_getRandomPeers &object); @@ -742,6 +784,8 @@ void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadNextBlockFull &o void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadPersistentState &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadPersistentStateSlice &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_downloadZeroState &object); +void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveInfo &object); +void to_json(JsonValueScope &jv, const ton_api::tonNode_getArchiveSlice &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_getCapabilities &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_getNextBlockDescription &object); void to_json(JsonValueScope &jv, const ton_api::tonNode_getNextBlocksDescription &object); diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp index 1facb43fa7..1b6fb98d11 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.cpp @@ -37,6 +37,267 @@ void accountAddress::store(td::TlStorerToString &s, const char *field_name) cons } } +accountRevisionList::accountRevisionList() + : revisions_() +{} + +accountRevisionList::accountRevisionList(std::vector &&revisions_) + : revisions_(std::move(revisions_)) +{} + +const std::int32_t accountRevisionList::ID; + +void accountRevisionList::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "accountRevisionList"); + { const std::vector &v = revisions_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("revisions", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { s.store_field("", v[i]); } s.store_class_end(); } + s.store_class_end(); + } +} + +raw_accountState::raw_accountState() + : code_() + , data_() + , frozen_hash_() +{} + +raw_accountState::raw_accountState(std::string const &code_, std::string const &data_, std::string const &frozen_hash_) + : code_(std::move(code_)) + , data_(std::move(data_)) + , frozen_hash_(std::move(frozen_hash_)) +{} + +const std::int32_t raw_accountState::ID; + +void raw_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "raw_accountState"); + s.store_bytes_field("code", code_); + s.store_bytes_field("data", data_); + s.store_bytes_field("frozen_hash", frozen_hash_); + s.store_class_end(); + } +} + +testWallet_accountState::testWallet_accountState() + : seqno_() +{} + +testWallet_accountState::testWallet_accountState(std::int32_t seqno_) + : seqno_(seqno_) +{} + +const std::int32_t testWallet_accountState::ID; + +void testWallet_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "testWallet_accountState"); + s.store_field("seqno", seqno_); + s.store_class_end(); + } +} + +wallet_accountState::wallet_accountState() + : seqno_() +{} + +wallet_accountState::wallet_accountState(std::int32_t seqno_) + : seqno_(seqno_) +{} + +const std::int32_t wallet_accountState::ID; + +void wallet_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_accountState"); + s.store_field("seqno", seqno_); + s.store_class_end(); + } +} + +wallet_v3_accountState::wallet_v3_accountState() + : wallet_id_() + , seqno_() +{} + +wallet_v3_accountState::wallet_v3_accountState(std::int64_t wallet_id_, std::int32_t seqno_) + : wallet_id_(wallet_id_) + , seqno_(seqno_) +{} + +const std::int32_t wallet_v3_accountState::ID; + +void wallet_v3_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_v3_accountState"); + s.store_field("wallet_id", wallet_id_); + s.store_field("seqno", seqno_); + s.store_class_end(); + } +} + +wallet_highload_v1_accountState::wallet_highload_v1_accountState() + : wallet_id_() + , seqno_() +{} + +wallet_highload_v1_accountState::wallet_highload_v1_accountState(std::int64_t wallet_id_, std::int32_t seqno_) + : wallet_id_(wallet_id_) + , seqno_(seqno_) +{} + +const std::int32_t wallet_highload_v1_accountState::ID; + +void wallet_highload_v1_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_highload_v1_accountState"); + s.store_field("wallet_id", wallet_id_); + s.store_field("seqno", seqno_); + s.store_class_end(); + } +} + +wallet_highload_v2_accountState::wallet_highload_v2_accountState() + : wallet_id_() +{} + +wallet_highload_v2_accountState::wallet_highload_v2_accountState(std::int64_t wallet_id_) + : wallet_id_(wallet_id_) +{} + +const std::int32_t wallet_highload_v2_accountState::ID; + +void wallet_highload_v2_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_highload_v2_accountState"); + s.store_field("wallet_id", wallet_id_); + s.store_class_end(); + } +} + +testGiver_accountState::testGiver_accountState() + : seqno_() +{} + +testGiver_accountState::testGiver_accountState(std::int32_t seqno_) + : seqno_(seqno_) +{} + +const std::int32_t testGiver_accountState::ID; + +void testGiver_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "testGiver_accountState"); + s.store_field("seqno", seqno_); + s.store_class_end(); + } +} + +dns_accountState::dns_accountState() + : wallet_id_() +{} + +dns_accountState::dns_accountState(std::int64_t wallet_id_) + : wallet_id_(wallet_id_) +{} + +const std::int32_t dns_accountState::ID; + +void dns_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_accountState"); + s.store_field("wallet_id", wallet_id_); + s.store_class_end(); + } +} + +uninited_accountState::uninited_accountState() + : frozen_hash_() +{} + +uninited_accountState::uninited_accountState(std::string const &frozen_hash_) + : frozen_hash_(std::move(frozen_hash_)) +{} + +const std::int32_t uninited_accountState::ID; + +void uninited_accountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "uninited_accountState"); + s.store_bytes_field("frozen_hash", frozen_hash_); + s.store_class_end(); + } +} + +actionNoop::actionNoop() { +} + +const std::int32_t actionNoop::ID; + +void actionNoop::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "actionNoop"); + s.store_class_end(); + } +} + +actionMsg::actionMsg() + : messages_() + , allow_send_to_uninited_() +{} + +actionMsg::actionMsg(std::vector> &&messages_, bool allow_send_to_uninited_) + : messages_(std::move(messages_)) + , allow_send_to_uninited_(allow_send_to_uninited_) +{} + +const std::int32_t actionMsg::ID; + +void actionMsg::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "actionMsg"); + { const std::vector> &v = messages_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("messages", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_field("allow_send_to_uninited", allow_send_to_uninited_); + s.store_class_end(); + } +} + +actionDns::actionDns() + : actions_() +{} + +actionDns::actionDns(std::vector> &&actions_) + : actions_(std::move(actions_)) +{} + +const std::int32_t actionDns::ID; + +void actionDns::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "actionDns"); + { const std::vector> &v = actions_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("actions", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_class_end(); + } +} + +adnlAddress::adnlAddress() + : adnl_address_() +{} + +adnlAddress::adnlAddress(std::string const &adnl_address_) + : adnl_address_(std::move(adnl_address_)) +{} + +const std::int32_t adnlAddress::ID; + +void adnlAddress::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "adnlAddress"); + s.store_field("adnl_address", adnl_address_); + s.store_class_end(); + } +} + bip39Hints::bip39Hints() : words_() {} @@ -175,6 +436,24 @@ void exportedPemKey::store(td::TlStorerToString &s, const char *field_name) cons } } +exportedUnencryptedKey::exportedUnencryptedKey() + : data_() +{} + +exportedUnencryptedKey::exportedUnencryptedKey(td::SecureString &&data_) + : data_(std::move(data_)) +{} + +const std::int32_t exportedUnencryptedKey::ID; + +void exportedUnencryptedKey::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "exportedUnencryptedKey"); + s.store_bytes_field("data", data_); + s.store_class_end(); + } +} + fees::fees() : in_fwd_fee_() , storage_fee_() @@ -202,6 +481,189 @@ void fees::store(td::TlStorerToString &s, const char *field_name) const { } } +fullAccountState::fullAccountState() + : balance_() + , last_transaction_id_() + , block_id_() + , sync_utime_() + , account_state_() +{} + +fullAccountState::fullAccountState(std::int64_t balance_, object_ptr &&last_transaction_id_, object_ptr &&block_id_, std::int64_t sync_utime_, object_ptr &&account_state_) + : balance_(balance_) + , last_transaction_id_(std::move(last_transaction_id_)) + , block_id_(std::move(block_id_)) + , sync_utime_(sync_utime_) + , account_state_(std::move(account_state_)) +{} + +const std::int32_t fullAccountState::ID; + +void fullAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "fullAccountState"); + s.store_field("balance", balance_); + if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } + if (block_id_ == nullptr) { s.store_field("block_id", "null"); } else { block_id_->store(s, "block_id"); } + s.store_field("sync_utime", sync_utime_); + if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_end(); + } +} + +raw_initialAccountState::raw_initialAccountState() + : code_() + , data_() +{} + +raw_initialAccountState::raw_initialAccountState(std::string const &code_, std::string const &data_) + : code_(std::move(code_)) + , data_(std::move(data_)) +{} + +const std::int32_t raw_initialAccountState::ID; + +void raw_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "raw_initialAccountState"); + s.store_bytes_field("code", code_); + s.store_bytes_field("data", data_); + s.store_class_end(); + } +} + +testGiver_initialAccountState::testGiver_initialAccountState() { +} + +const std::int32_t testGiver_initialAccountState::ID; + +void testGiver_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "testGiver_initialAccountState"); + s.store_class_end(); + } +} + +testWallet_initialAccountState::testWallet_initialAccountState() + : public_key_() +{} + +testWallet_initialAccountState::testWallet_initialAccountState(std::string const &public_key_) + : public_key_(std::move(public_key_)) +{} + +const std::int32_t testWallet_initialAccountState::ID; + +void testWallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "testWallet_initialAccountState"); + s.store_field("public_key", public_key_); + s.store_class_end(); + } +} + +wallet_initialAccountState::wallet_initialAccountState() + : public_key_() +{} + +wallet_initialAccountState::wallet_initialAccountState(std::string const &public_key_) + : public_key_(std::move(public_key_)) +{} + +const std::int32_t wallet_initialAccountState::ID; + +void wallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_initialAccountState"); + s.store_field("public_key", public_key_); + s.store_class_end(); + } +} + +wallet_v3_initialAccountState::wallet_v3_initialAccountState() + : public_key_() + , wallet_id_() +{} + +wallet_v3_initialAccountState::wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_) + : public_key_(std::move(public_key_)) + , wallet_id_(wallet_id_) +{} + +const std::int32_t wallet_v3_initialAccountState::ID; + +void wallet_v3_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_v3_initialAccountState"); + s.store_field("public_key", public_key_); + s.store_field("wallet_id", wallet_id_); + s.store_class_end(); + } +} + +wallet_highload_v1_initialAccountState::wallet_highload_v1_initialAccountState() + : public_key_() + , wallet_id_() +{} + +wallet_highload_v1_initialAccountState::wallet_highload_v1_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_) + : public_key_(std::move(public_key_)) + , wallet_id_(wallet_id_) +{} + +const std::int32_t wallet_highload_v1_initialAccountState::ID; + +void wallet_highload_v1_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_highload_v1_initialAccountState"); + s.store_field("public_key", public_key_); + s.store_field("wallet_id", wallet_id_); + s.store_class_end(); + } +} + +wallet_highload_v2_initialAccountState::wallet_highload_v2_initialAccountState() + : public_key_() + , wallet_id_() +{} + +wallet_highload_v2_initialAccountState::wallet_highload_v2_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_) + : public_key_(std::move(public_key_)) + , wallet_id_(wallet_id_) +{} + +const std::int32_t wallet_highload_v2_initialAccountState::ID; + +void wallet_highload_v2_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "wallet_highload_v2_initialAccountState"); + s.store_field("public_key", public_key_); + s.store_field("wallet_id", wallet_id_); + s.store_class_end(); + } +} + +dns_initialAccountState::dns_initialAccountState() + : public_key_() + , wallet_id_() +{} + +dns_initialAccountState::dns_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_) + : public_key_(std::move(public_key_)) + , wallet_id_(wallet_id_) +{} + +const std::int32_t dns_initialAccountState::ID; + +void dns_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_initialAccountState"); + s.store_field("public_key", public_key_); + s.store_field("wallet_id", wallet_id_); + s.store_class_end(); + } +} + inputKeyRegular::inputKeyRegular() : key_() , local_password_() @@ -400,27 +862,6 @@ void options::store(td::TlStorerToString &s, const char *field_name) const { } } -sendGramsResult::sendGramsResult() - : sent_until_() - , body_hash_() -{} - -sendGramsResult::sendGramsResult(std::int64_t sent_until_, std::string const &body_hash_) - : sent_until_(sent_until_) - , body_hash_(std::move(body_hash_)) -{} - -const std::int32_t sendGramsResult::ID; - -void sendGramsResult::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "sendGramsResult"); - s.store_field("sent_until", sent_until_); - s.store_bytes_field("body_hash", body_hash_); - s.store_class_end(); - } -} - syncStateDone::syncStateDone() { } @@ -523,110 +964,209 @@ void updateSyncState::store(td::TlStorerToString &s, const char *field_name) con } } -generic_accountStateRaw::generic_accountStateRaw() - : account_state_() -{} +dns_actionDeleteAll::dns_actionDeleteAll() { +} -generic_accountStateRaw::generic_accountStateRaw(object_ptr &&account_state_) - : account_state_(std::move(account_state_)) -{} +const std::int32_t dns_actionDeleteAll::ID; -const std::int32_t generic_accountStateRaw::ID; - -void generic_accountStateRaw::store(td::TlStorerToString &s, const char *field_name) const { +void dns_actionDeleteAll::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_accountStateRaw"); - if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_begin(field_name, "dns_actionDeleteAll"); s.store_class_end(); } } -generic_accountStateTestWallet::generic_accountStateTestWallet() - : account_state_() +dns_actionDelete::dns_actionDelete() + : name_() + , category_() {} -generic_accountStateTestWallet::generic_accountStateTestWallet(object_ptr &&account_state_) - : account_state_(std::move(account_state_)) +dns_actionDelete::dns_actionDelete(std::string const &name_, std::int32_t category_) + : name_(std::move(name_)) + , category_(category_) {} -const std::int32_t generic_accountStateTestWallet::ID; +const std::int32_t dns_actionDelete::ID; -void generic_accountStateTestWallet::store(td::TlStorerToString &s, const char *field_name) const { +void dns_actionDelete::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_accountStateTestWallet"); - if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_begin(field_name, "dns_actionDelete"); + s.store_field("name", name_); + s.store_field("category", category_); s.store_class_end(); } } -generic_accountStateWallet::generic_accountStateWallet() - : account_state_() +dns_actionSet::dns_actionSet() + : entry_() {} -generic_accountStateWallet::generic_accountStateWallet(object_ptr &&account_state_) - : account_state_(std::move(account_state_)) +dns_actionSet::dns_actionSet(object_ptr &&entry_) + : entry_(std::move(entry_)) {} -const std::int32_t generic_accountStateWallet::ID; +const std::int32_t dns_actionSet::ID; -void generic_accountStateWallet::store(td::TlStorerToString &s, const char *field_name) const { +void dns_actionSet::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_accountStateWallet"); - if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_begin(field_name, "dns_actionSet"); + if (entry_ == nullptr) { s.store_field("entry", "null"); } else { entry_->store(s, "entry"); } s.store_class_end(); } } -generic_accountStateWalletV3::generic_accountStateWalletV3() - : account_state_() +dns_entry::dns_entry() + : name_() + , category_() + , entry_() {} -generic_accountStateWalletV3::generic_accountStateWalletV3(object_ptr &&account_state_) - : account_state_(std::move(account_state_)) +dns_entry::dns_entry(std::string const &name_, std::int32_t category_, object_ptr &&entry_) + : name_(std::move(name_)) + , category_(category_) + , entry_(std::move(entry_)) {} -const std::int32_t generic_accountStateWalletV3::ID; +const std::int32_t dns_entry::ID; -void generic_accountStateWalletV3::store(td::TlStorerToString &s, const char *field_name) const { +void dns_entry::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_accountStateWalletV3"); - if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_begin(field_name, "dns_entry"); + s.store_field("name", name_); + s.store_field("category", category_); + if (entry_ == nullptr) { s.store_field("entry", "null"); } else { entry_->store(s, "entry"); } s.store_class_end(); } } -generic_accountStateTestGiver::generic_accountStateTestGiver() - : account_state_() +dns_entryDataUnknown::dns_entryDataUnknown() + : bytes_() {} -generic_accountStateTestGiver::generic_accountStateTestGiver(object_ptr &&account_state_) - : account_state_(std::move(account_state_)) +dns_entryDataUnknown::dns_entryDataUnknown(std::string const &bytes_) + : bytes_(std::move(bytes_)) {} -const std::int32_t generic_accountStateTestGiver::ID; +const std::int32_t dns_entryDataUnknown::ID; -void generic_accountStateTestGiver::store(td::TlStorerToString &s, const char *field_name) const { +void dns_entryDataUnknown::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_accountStateTestGiver"); - if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_begin(field_name, "dns_entryDataUnknown"); + s.store_bytes_field("bytes", bytes_); s.store_class_end(); } } -generic_accountStateUninited::generic_accountStateUninited() - : account_state_() +dns_entryDataText::dns_entryDataText() + : text_() {} -generic_accountStateUninited::generic_accountStateUninited(object_ptr &&account_state_) - : account_state_(std::move(account_state_)) +dns_entryDataText::dns_entryDataText(std::string const &text_) + : text_(std::move(text_)) {} -const std::int32_t generic_accountStateUninited::ID; +const std::int32_t dns_entryDataText::ID; -void generic_accountStateUninited::store(td::TlStorerToString &s, const char *field_name) const { +void dns_entryDataText::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_accountStateUninited"); - if (account_state_ == nullptr) { s.store_field("account_state", "null"); } else { account_state_->store(s, "account_state"); } + s.store_class_begin(field_name, "dns_entryDataText"); + s.store_field("text", text_); + s.store_class_end(); + } +} + +dns_entryDataNextResolver::dns_entryDataNextResolver() + : resolver_() +{} + +dns_entryDataNextResolver::dns_entryDataNextResolver(object_ptr &&resolver_) + : resolver_(std::move(resolver_)) +{} + +const std::int32_t dns_entryDataNextResolver::ID; + +void dns_entryDataNextResolver::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_entryDataNextResolver"); + if (resolver_ == nullptr) { s.store_field("resolver", "null"); } else { resolver_->store(s, "resolver"); } + s.store_class_end(); + } +} + +dns_entryDataSmcAddress::dns_entryDataSmcAddress() + : smc_address_() +{} + +dns_entryDataSmcAddress::dns_entryDataSmcAddress(object_ptr &&smc_address_) + : smc_address_(std::move(smc_address_)) +{} + +const std::int32_t dns_entryDataSmcAddress::ID; + +void dns_entryDataSmcAddress::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_entryDataSmcAddress"); + if (smc_address_ == nullptr) { s.store_field("smc_address", "null"); } else { smc_address_->store(s, "smc_address"); } + s.store_class_end(); + } +} + +dns_entryDataAdnlAddress::dns_entryDataAdnlAddress() + : adnl_address_() +{} + +dns_entryDataAdnlAddress::dns_entryDataAdnlAddress(object_ptr &&adnl_address_) + : adnl_address_(std::move(adnl_address_)) +{} + +const std::int32_t dns_entryDataAdnlAddress::ID; + +void dns_entryDataAdnlAddress::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_entryDataAdnlAddress"); + if (adnl_address_ == nullptr) { s.store_field("adnl_address", "null"); } else { adnl_address_->store(s, "adnl_address"); } + s.store_class_end(); + } +} + +dns_resolved::dns_resolved() + : entries_() +{} + +dns_resolved::dns_resolved(std::vector> &&entries_) + : entries_(std::move(entries_)) +{} + +const std::int32_t dns_resolved::ID; + +void dns_resolved::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_resolved"); + { const std::vector> &v = entries_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("entries", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_class_end(); + } +} + +ton_blockId::ton_blockId() + : workchain_() + , shard_() + , seqno_() +{} + +ton_blockId::ton_blockId(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_) + : workchain_(workchain_) + , shard_(shard_) + , seqno_(seqno_) +{} + +const std::int32_t ton_blockId::ID; + +void ton_blockId::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "ton_blockId"); + s.store_field("workchain", workchain_); + s.store_field("shard", shard_); + s.store_field("seqno", seqno_); s.store_class_end(); } } @@ -676,6 +1216,120 @@ void liteServer_info::store(td::TlStorerToString &s, const char *field_name) con } } +msg_dataRaw::msg_dataRaw() + : body_() +{} + +msg_dataRaw::msg_dataRaw(std::string const &body_) + : body_(std::move(body_)) +{} + +const std::int32_t msg_dataRaw::ID; + +void msg_dataRaw::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_dataRaw"); + s.store_bytes_field("body", body_); + s.store_class_end(); + } +} + +msg_dataText::msg_dataText() + : text_() +{} + +msg_dataText::msg_dataText(std::string const &text_) + : text_(std::move(text_)) +{} + +const std::int32_t msg_dataText::ID; + +void msg_dataText::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_dataText"); + s.store_bytes_field("text", text_); + s.store_class_end(); + } +} + +msg_dataDecryptedText::msg_dataDecryptedText() + : text_() +{} + +msg_dataDecryptedText::msg_dataDecryptedText(std::string const &text_) + : text_(std::move(text_)) +{} + +const std::int32_t msg_dataDecryptedText::ID; + +void msg_dataDecryptedText::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_dataDecryptedText"); + s.store_bytes_field("text", text_); + s.store_class_end(); + } +} + +msg_dataEncryptedText::msg_dataEncryptedText() + : text_() +{} + +msg_dataEncryptedText::msg_dataEncryptedText(std::string const &text_) + : text_(std::move(text_)) +{} + +const std::int32_t msg_dataEncryptedText::ID; + +void msg_dataEncryptedText::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_dataEncryptedText"); + s.store_bytes_field("text", text_); + s.store_class_end(); + } +} + +msg_dataArray::msg_dataArray() + : elements_() +{} + +msg_dataArray::msg_dataArray(std::vector> &&elements_) + : elements_(std::move(elements_)) +{} + +const std::int32_t msg_dataArray::ID; + +void msg_dataArray::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_dataArray"); + { const std::vector> &v = elements_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("elements", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } + s.store_class_end(); + } +} + +msg_message::msg_message() + : destination_() + , amount_() + , data_() +{} + +msg_message::msg_message(object_ptr &&destination_, std::int64_t amount_, object_ptr &&data_) + : destination_(std::move(destination_)) + , amount_(amount_) + , data_(std::move(data_)) +{} + +const std::int32_t msg_message::ID; + +void msg_message::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_message"); + if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); } + s.store_field("amount", amount_); + if (data_ == nullptr) { s.store_field("data", "null"); } else { data_->store(s, "data"); } + s.store_class_end(); + } +} + options_configInfo::options_configInfo() : default_wallet_id_() {} @@ -694,12 +1348,30 @@ void options_configInfo::store(td::TlStorerToString &s, const char *field_name) } } +options_info::options_info() + : config_info_() +{} + +options_info::options_info(object_ptr &&config_info_) + : config_info_(std::move(config_info_)) +{} + +const std::int32_t options_info::ID; + +void options_info::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "options_info"); + if (config_info_ == nullptr) { s.store_field("config_info", "null"); } else { config_info_->store(s, "config_info"); } + s.store_class_end(); + } +} + query_fees::query_fees() : source_fees_() , destination_fees_() {} -query_fees::query_fees(object_ptr &&source_fees_, object_ptr &&destination_fees_) +query_fees::query_fees(object_ptr &&source_fees_, std::vector> &&destination_fees_) : source_fees_(std::move(source_fees_)) , destination_fees_(std::move(destination_fees_)) {} @@ -710,7 +1382,7 @@ void query_fees::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { s.store_class_begin(field_name, "query_fees"); if (source_fees_ == nullptr) { s.store_field("source_fees", "null"); } else { source_fees_->store(s, "source_fees"); } - if (destination_fees_ == nullptr) { s.store_field("destination_fees", "null"); } else { destination_fees_->store(s, "destination_fees"); } + { const std::vector> &v = destination_fees_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("destination_fees", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } s.store_class_end(); } } @@ -739,60 +1411,42 @@ void query_info::store(td::TlStorerToString &s, const char *field_name) const { } } -raw_accountState::raw_accountState() +raw_fullAccountState::raw_fullAccountState() : balance_() , code_() , data_() , last_transaction_id_() + , block_id_() , frozen_hash_() , sync_utime_() {} -raw_accountState::raw_accountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_) +raw_fullAccountState::raw_fullAccountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr &&last_transaction_id_, object_ptr &&block_id_, std::string const &frozen_hash_, std::int64_t sync_utime_) : balance_(balance_) , code_(std::move(code_)) , data_(std::move(data_)) , last_transaction_id_(std::move(last_transaction_id_)) + , block_id_(std::move(block_id_)) , frozen_hash_(std::move(frozen_hash_)) , sync_utime_(sync_utime_) {} -const std::int32_t raw_accountState::ID; +const std::int32_t raw_fullAccountState::ID; -void raw_accountState::store(td::TlStorerToString &s, const char *field_name) const { +void raw_fullAccountState::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "raw_accountState"); + s.store_class_begin(field_name, "raw_fullAccountState"); s.store_field("balance", balance_); s.store_bytes_field("code", code_); s.store_bytes_field("data", data_); if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } + if (block_id_ == nullptr) { s.store_field("block_id", "null"); } else { block_id_->store(s, "block_id"); } s.store_bytes_field("frozen_hash", frozen_hash_); s.store_field("sync_utime", sync_utime_); s.store_class_end(); } } -raw_initialAccountState::raw_initialAccountState() - : code_() - , data_() -{} - -raw_initialAccountState::raw_initialAccountState(std::string const &code_, std::string const &data_) - : code_(std::move(code_)) - , data_(std::move(data_)) -{} - -const std::int32_t raw_initialAccountState::ID; - -void raw_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "raw_initialAccountState"); - s.store_bytes_field("code", code_); - s.store_bytes_field("data", data_); - s.store_class_end(); - } -} - raw_message::raw_message() : source_() , destination_() @@ -801,10 +1455,10 @@ raw_message::raw_message() , ihr_fee_() , created_lt_() , body_hash_() - , message_() + , msg_data_() {} -raw_message::raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, std::string const &message_) +raw_message::raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, object_ptr &&msg_data_) : source_(std::move(source_)) , destination_(std::move(destination_)) , value_(value_) @@ -812,7 +1466,7 @@ raw_message::raw_message(std::string const &source_, std::string const &destinat , ihr_fee_(ihr_fee_) , created_lt_(created_lt_) , body_hash_(std::move(body_hash_)) - , message_(std::move(message_)) + , msg_data_(std::move(msg_data_)) {} const std::int32_t raw_message::ID; @@ -827,7 +1481,7 @@ void raw_message::store(td::TlStorerToString &s, const char *field_name) const { s.store_field("ihr_fee", ihr_fee_); s.store_field("created_lt", created_lt_); s.store_bytes_field("body_hash", body_hash_); - s.store_bytes_field("message", message_); + if (msg_data_ == nullptr) { s.store_field("msg_data", "null"); } else { msg_data_->store(s, "msg_data"); } s.store_class_end(); } } @@ -970,74 +1624,32 @@ void smc_runResult::store(td::TlStorerToString &s, const char *field_name) const } } -testGiver_accountState::testGiver_accountState() - : balance_() +ton_blockIdExt::ton_blockIdExt() + : workchain_() + , shard_() , seqno_() - , last_transaction_id_() - , sync_utime_() + , root_hash_() + , file_hash_() {} -testGiver_accountState::testGiver_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_) - : balance_(balance_) +ton_blockIdExt::ton_blockIdExt(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::string const &root_hash_, std::string const &file_hash_) + : workchain_(workchain_) + , shard_(shard_) , seqno_(seqno_) - , last_transaction_id_(std::move(last_transaction_id_)) - , sync_utime_(sync_utime_) + , root_hash_(std::move(root_hash_)) + , file_hash_(std::move(file_hash_)) {} -const std::int32_t testGiver_accountState::ID; +const std::int32_t ton_blockIdExt::ID; -void testGiver_accountState::store(td::TlStorerToString &s, const char *field_name) const { +void ton_blockIdExt::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testGiver_accountState"); - s.store_field("balance", balance_); + s.store_class_begin(field_name, "ton_blockIdExt"); + s.store_field("workchain", workchain_); + s.store_field("shard", shard_); s.store_field("seqno", seqno_); - if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } - s.store_field("sync_utime", sync_utime_); - s.store_class_end(); - } -} - -testWallet_accountState::testWallet_accountState() - : balance_() - , seqno_() - , last_transaction_id_() - , sync_utime_() -{} - -testWallet_accountState::testWallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_) - : balance_(balance_) - , seqno_(seqno_) - , last_transaction_id_(std::move(last_transaction_id_)) - , sync_utime_(sync_utime_) -{} - -const std::int32_t testWallet_accountState::ID; - -void testWallet_accountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testWallet_accountState"); - s.store_field("balance", balance_); - s.store_field("seqno", seqno_); - if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } - s.store_field("sync_utime", sync_utime_); - s.store_class_end(); - } -} - -testWallet_initialAccountState::testWallet_initialAccountState() - : public_key_() -{} - -testWallet_initialAccountState::testWallet_initialAccountState(std::string const &public_key_) - : public_key_(std::move(public_key_)) -{} - -const std::int32_t testWallet_initialAccountState::ID; - -void testWallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testWallet_initialAccountState"); - s.store_field("public_key", public_key_); + s.store_bytes_field("root_hash", root_hash_); + s.store_bytes_field("file_hash", file_hash_); s.store_class_end(); } } @@ -1055,7 +1667,25 @@ const std::int32_t tvm_cell::ID; void tvm_cell::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { s.store_class_begin(field_name, "tvm_cell"); - s.store_field("bytes", bytes_); + s.store_bytes_field("bytes", bytes_); + s.store_class_end(); + } +} + +tvm_list::tvm_list() + : elements_() +{} + +tvm_list::tvm_list(std::vector> &&elements_) + : elements_(std::move(elements_)) +{} + +const std::int32_t tvm_list::ID; + +void tvm_list::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tvm_list"); + { const std::vector> &v = elements_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("elements", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } s.store_class_end(); } } @@ -1091,7 +1721,7 @@ const std::int32_t tvm_slice::ID; void tvm_slice::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { s.store_class_begin(field_name, "tvm_slice"); - s.store_field("bytes", bytes_); + s.store_bytes_field("bytes", bytes_); s.store_class_end(); } } @@ -1150,6 +1780,42 @@ void tvm_stackEntryNumber::store(td::TlStorerToString &s, const char *field_name } } +tvm_stackEntryTuple::tvm_stackEntryTuple() + : tuple_() +{} + +tvm_stackEntryTuple::tvm_stackEntryTuple(object_ptr &&tuple_) + : tuple_(std::move(tuple_)) +{} + +const std::int32_t tvm_stackEntryTuple::ID; + +void tvm_stackEntryTuple::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tvm_stackEntryTuple"); + if (tuple_ == nullptr) { s.store_field("tuple", "null"); } else { tuple_->store(s, "tuple"); } + s.store_class_end(); + } +} + +tvm_stackEntryList::tvm_stackEntryList() + : list_() +{} + +tvm_stackEntryList::tvm_stackEntryList(object_ptr &&list_) + : list_(std::move(list_)) +{} + +const std::int32_t tvm_stackEntryList::ID; + +void tvm_stackEntryList::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "tvm_stackEntryList"); + if (list_ == nullptr) { s.store_field("list", "null"); } else { list_->store(s, "list"); } + s.store_class_end(); + } +} + tvm_stackEntryUnsupported::tvm_stackEntryUnsupported() { } @@ -1162,125 +1828,20 @@ void tvm_stackEntryUnsupported::store(td::TlStorerToString &s, const char *field } } -uninited_accountState::uninited_accountState() - : balance_() - , last_transaction_id_() - , frozen_hash_() - , sync_utime_() +tvm_tuple::tvm_tuple() + : elements_() {} -uninited_accountState::uninited_accountState(std::int64_t balance_, object_ptr &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_) - : balance_(balance_) - , last_transaction_id_(std::move(last_transaction_id_)) - , frozen_hash_(std::move(frozen_hash_)) - , sync_utime_(sync_utime_) +tvm_tuple::tvm_tuple(std::vector> &&elements_) + : elements_(std::move(elements_)) {} -const std::int32_t uninited_accountState::ID; +const std::int32_t tvm_tuple::ID; -void uninited_accountState::store(td::TlStorerToString &s, const char *field_name) const { +void tvm_tuple::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "uninited_accountState"); - s.store_field("balance", balance_); - if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } - s.store_bytes_field("frozen_hash", frozen_hash_); - s.store_field("sync_utime", sync_utime_); - s.store_class_end(); - } -} - -wallet_accountState::wallet_accountState() - : balance_() - , seqno_() - , last_transaction_id_() - , sync_utime_() -{} - -wallet_accountState::wallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_) - : balance_(balance_) - , seqno_(seqno_) - , last_transaction_id_(std::move(last_transaction_id_)) - , sync_utime_(sync_utime_) -{} - -const std::int32_t wallet_accountState::ID; - -void wallet_accountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_accountState"); - s.store_field("balance", balance_); - s.store_field("seqno", seqno_); - if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } - s.store_field("sync_utime", sync_utime_); - s.store_class_end(); - } -} - -wallet_initialAccountState::wallet_initialAccountState() - : public_key_() -{} - -wallet_initialAccountState::wallet_initialAccountState(std::string const &public_key_) - : public_key_(std::move(public_key_)) -{} - -const std::int32_t wallet_initialAccountState::ID; - -void wallet_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_initialAccountState"); - s.store_field("public_key", public_key_); - s.store_class_end(); - } -} - -wallet_v3_accountState::wallet_v3_accountState() - : balance_() - , wallet_id_() - , seqno_() - , last_transaction_id_() - , sync_utime_() -{} - -wallet_v3_accountState::wallet_v3_accountState(std::int64_t balance_, std::int64_t wallet_id_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_) - : balance_(balance_) - , wallet_id_(wallet_id_) - , seqno_(seqno_) - , last_transaction_id_(std::move(last_transaction_id_)) - , sync_utime_(sync_utime_) -{} - -const std::int32_t wallet_v3_accountState::ID; - -void wallet_v3_accountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_v3_accountState"); - s.store_field("balance", balance_); - s.store_field("wallet_id", wallet_id_); - s.store_field("seqno", seqno_); - if (last_transaction_id_ == nullptr) { s.store_field("last_transaction_id", "null"); } else { last_transaction_id_->store(s, "last_transaction_id"); } - s.store_field("sync_utime", sync_utime_); - s.store_class_end(); - } -} - -wallet_v3_initialAccountState::wallet_v3_initialAccountState() - : public_key_() - , wallet_id_() -{} - -wallet_v3_initialAccountState::wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_) - : public_key_(std::move(public_key_)) - , wallet_id_(wallet_id_) -{} - -const std::int32_t wallet_v3_initialAccountState::ID; - -void wallet_v3_initialAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_v3_initialAccountState"); - s.store_field("public_key", public_key_); - s.store_field("wallet_id", wallet_id_); + s.store_class_begin(field_name, "tvm_tuple"); + { const std::vector> &v = elements_; const std::uint32_t multiplicity = static_cast(v.size()); const auto vector_name = "vector[" + td::to_string(multiplicity)+ "]"; s.store_class_begin("elements", vector_name.c_str()); for (std::uint32_t i = 0; i < multiplicity; i++) { if (v[i] == nullptr) { s.store_field("", "null"); } else { v[i]->store(s, ""); } } s.store_class_end(); } s.store_class_end(); } } @@ -1363,6 +1924,33 @@ void createNewKey::store(td::TlStorerToString &s, const char *field_name) const } } +createQuery::createQuery() + : private_key_() + , address_() + , timeout_() + , action_() +{} + +createQuery::createQuery(object_ptr &&private_key_, object_ptr &&address_, std::int32_t timeout_, object_ptr &&action_) + : private_key_(std::move(private_key_)) + , address_(std::move(address_)) + , timeout_(timeout_) + , action_(std::move(action_)) +{} + +const std::int32_t createQuery::ID; + +void createQuery::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "createQuery"); + if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } + if (address_ == nullptr) { s.store_field("address", "null"); } else { address_->store(s, "address"); } + s.store_field("timeout", timeout_); + if (action_ == nullptr) { s.store_field("action", "null"); } else { action_->store(s, "action"); } + s.store_class_end(); + } +} + decrypt::decrypt() : encrypted_data_() , secret_() @@ -1414,6 +2002,33 @@ void deleteKey::store(td::TlStorerToString &s, const char *field_name) const { } } +dns_resolve::dns_resolve() + : account_address_() + , name_() + , category_() + , ttl_() +{} + +dns_resolve::dns_resolve(object_ptr &&account_address_, std::string const &name_, std::int32_t category_, std::int32_t ttl_) + : account_address_(std::move(account_address_)) + , name_(std::move(name_)) + , category_(category_) + , ttl_(ttl_) +{} + +const std::int32_t dns_resolve::ID; + +void dns_resolve::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "dns_resolve"); + if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); } + s.store_field("name", name_); + s.store_field("category", category_); + s.store_field("ttl", ttl_); + s.store_class_end(); + } +} + encrypt::encrypt() : decrypted_data_() , secret_() @@ -1495,96 +2110,63 @@ void exportPemKey::store(td::TlStorerToString &s, const char *field_name) const } } -generic_createSendGramsQuery::generic_createSendGramsQuery() - : private_key_() - , source_() - , destination_() - , amount_() - , timeout_() - , allow_send_to_uninited_() - , message_() +exportUnencryptedKey::exportUnencryptedKey() + : input_key_() {} -generic_createSendGramsQuery::generic_createSendGramsQuery(object_ptr &&private_key_, object_ptr &&source_, object_ptr &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_) - : private_key_(std::move(private_key_)) - , source_(std::move(source_)) - , destination_(std::move(destination_)) - , amount_(amount_) - , timeout_(timeout_) - , allow_send_to_uninited_(allow_send_to_uninited_) - , message_(std::move(message_)) +exportUnencryptedKey::exportUnencryptedKey(object_ptr &&input_key_) + : input_key_(std::move(input_key_)) {} -const std::int32_t generic_createSendGramsQuery::ID; +const std::int32_t exportUnencryptedKey::ID; -void generic_createSendGramsQuery::store(td::TlStorerToString &s, const char *field_name) const { +void exportUnencryptedKey::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_createSendGramsQuery"); - if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } - if (source_ == nullptr) { s.store_field("source", "null"); } else { source_->store(s, "source"); } - if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); } - s.store_field("amount", amount_); - s.store_field("timeout", timeout_); - s.store_field("allow_send_to_uninited", allow_send_to_uninited_); - s.store_bytes_field("message", message_); + s.store_class_begin(field_name, "exportUnencryptedKey"); + if (input_key_ == nullptr) { s.store_field("input_key", "null"); } else { input_key_->store(s, "input_key"); } s.store_class_end(); } } -generic_getAccountState::generic_getAccountState() +getAccountAddress::getAccountAddress() + : initial_account_state_() + , revision_() +{} + +getAccountAddress::getAccountAddress(object_ptr &&initial_account_state_, std::int32_t revision_) + : initial_account_state_(std::move(initial_account_state_)) + , revision_(revision_) +{} + +const std::int32_t getAccountAddress::ID; + +void getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "getAccountAddress"); + if (initial_account_state_ == nullptr) { s.store_field("initial_account_state", "null"); } else { initial_account_state_->store(s, "initial_account_state"); } + s.store_field("revision", revision_); + s.store_class_end(); + } +} + +getAccountState::getAccountState() : account_address_() {} -generic_getAccountState::generic_getAccountState(object_ptr &&account_address_) +getAccountState::getAccountState(object_ptr &&account_address_) : account_address_(std::move(account_address_)) {} -const std::int32_t generic_getAccountState::ID; +const std::int32_t getAccountState::ID; -void generic_getAccountState::store(td::TlStorerToString &s, const char *field_name) const { +void getAccountState::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_getAccountState"); + s.store_class_begin(field_name, "getAccountState"); if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); } s.store_class_end(); } } -generic_sendGrams::generic_sendGrams() - : private_key_() - , source_() - , destination_() - , amount_() - , timeout_() - , allow_send_to_uninited_() - , message_() -{} - -generic_sendGrams::generic_sendGrams(object_ptr &&private_key_, object_ptr &&source_, object_ptr &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_) - : private_key_(std::move(private_key_)) - , source_(std::move(source_)) - , destination_(std::move(destination_)) - , amount_(amount_) - , timeout_(timeout_) - , allow_send_to_uninited_(allow_send_to_uninited_) - , message_(std::move(message_)) -{} - -const std::int32_t generic_sendGrams::ID; - -void generic_sendGrams::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "generic_sendGrams"); - if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } - if (source_ == nullptr) { s.store_field("source", "null"); } else { source_->store(s, "source"); } - if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); } - s.store_field("amount", amount_); - s.store_field("timeout", timeout_); - s.store_field("allow_send_to_uninited", allow_send_to_uninited_); - s.store_bytes_field("message", message_); - s.store_class_end(); - } -} - getBip39Hints::getBip39Hints() : prefix_() {} @@ -1657,6 +2239,24 @@ void getLogVerbosityLevel::store(td::TlStorerToString &s, const char *field_name } } +guessAccountRevision::guessAccountRevision() + : initial_account_state_() +{} + +guessAccountRevision::guessAccountRevision(object_ptr &&initial_account_state_) + : initial_account_state_(std::move(initial_account_state_)) +{} + +const std::int32_t guessAccountRevision::ID; + +void guessAccountRevision::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "guessAccountRevision"); + if (initial_account_state_ == nullptr) { s.store_field("initial_account_state", "null"); } else { initial_account_state_->store(s, "initial_account_state"); } + s.store_class_end(); + } +} + importEncryptedKey::importEncryptedKey() : local_password_() , key_password_() @@ -1729,6 +2329,27 @@ void importPemKey::store(td::TlStorerToString &s, const char *field_name) const } } +importUnencryptedKey::importUnencryptedKey() + : local_password_() + , exported_unencrypted_key_() +{} + +importUnencryptedKey::importUnencryptedKey(td::SecureString &&local_password_, object_ptr &&exported_unencrypted_key_) + : local_password_(std::move(local_password_)) + , exported_unencrypted_key_(std::move(exported_unencrypted_key_)) +{} + +const std::int32_t importUnencryptedKey::ID; + +void importUnencryptedKey::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "importUnencryptedKey"); + s.store_bytes_field("local_password", local_password_); + if (exported_unencrypted_key_ == nullptr) { s.store_field("exported_unencrypted_key", "null"); } else { exported_unencrypted_key_->store(s, "exported_unencrypted_key"); } + s.store_class_end(); + } +} + init::init() : options_() {} @@ -1783,6 +2404,27 @@ void liteServer_getInfo::store(td::TlStorerToString &s, const char *field_name) } } +msg_decrypt::msg_decrypt() + : input_key_() + , data_() +{} + +msg_decrypt::msg_decrypt(object_ptr &&input_key_, object_ptr &&data_) + : input_key_(std::move(input_key_)) + , data_(std::move(data_)) +{} + +const std::int32_t msg_decrypt::ID; + +void msg_decrypt::store(td::TlStorerToString &s, const char *field_name) const { + if (!LOG_IS_STRIPPED(ERROR)) { + s.store_class_begin(field_name, "msg_decrypt"); + if (input_key_ == nullptr) { s.store_field("input_key", "null"); } else { input_key_->store(s, "input_key"); } + if (data_ == nullptr) { s.store_field("data", "null"); } else { data_->store(s, "data"); } + s.store_class_end(); + } +} + onLiteServerQueryError::onLiteServerQueryError() : id_() , error_() @@ -2005,24 +2647,6 @@ void raw_createQuery::store(td::TlStorerToString &s, const char *field_name) con } } -raw_getAccountAddress::raw_getAccountAddress() - : initital_account_state_() -{} - -raw_getAccountAddress::raw_getAccountAddress(object_ptr &&initital_account_state_) - : initital_account_state_(std::move(initital_account_state_)) -{} - -const std::int32_t raw_getAccountAddress::ID; - -void raw_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "raw_getAccountAddress"); - if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); } - s.store_class_end(); - } -} - raw_getAccountState::raw_getAccountState() : account_address_() {} @@ -2042,12 +2666,14 @@ void raw_getAccountState::store(td::TlStorerToString &s, const char *field_name) } raw_getTransactions::raw_getTransactions() - : account_address_() + : private_key_() + , account_address_() , from_transaction_id_() {} -raw_getTransactions::raw_getTransactions(object_ptr &&account_address_, object_ptr &&from_transaction_id_) - : account_address_(std::move(account_address_)) +raw_getTransactions::raw_getTransactions(object_ptr &&private_key_, object_ptr &&account_address_, object_ptr &&from_transaction_id_) + : private_key_(std::move(private_key_)) + , account_address_(std::move(account_address_)) , from_transaction_id_(std::move(from_transaction_id_)) {} @@ -2056,6 +2682,7 @@ const std::int32_t raw_getTransactions::ID; void raw_getTransactions::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { s.store_class_begin(field_name, "raw_getTransactions"); + if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); } if (from_transaction_id_ == nullptr) { s.store_field("from_transaction_id", "null"); } else { from_transaction_id_->store(s, "from_transaction_id"); } s.store_class_end(); @@ -2263,141 +2890,6 @@ void sync::store(td::TlStorerToString &s, const char *field_name) const { } } -testGiver_getAccountAddress::testGiver_getAccountAddress() { -} - -const std::int32_t testGiver_getAccountAddress::ID; - -void testGiver_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testGiver_getAccountAddress"); - s.store_class_end(); - } -} - -testGiver_getAccountState::testGiver_getAccountState() { -} - -const std::int32_t testGiver_getAccountState::ID; - -void testGiver_getAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testGiver_getAccountState"); - s.store_class_end(); - } -} - -testGiver_sendGrams::testGiver_sendGrams() - : destination_() - , seqno_() - , amount_() - , message_() -{} - -testGiver_sendGrams::testGiver_sendGrams(object_ptr &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_) - : destination_(std::move(destination_)) - , seqno_(seqno_) - , amount_(amount_) - , message_(std::move(message_)) -{} - -const std::int32_t testGiver_sendGrams::ID; - -void testGiver_sendGrams::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testGiver_sendGrams"); - if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); } - s.store_field("seqno", seqno_); - s.store_field("amount", amount_); - s.store_bytes_field("message", message_); - s.store_class_end(); - } -} - -testWallet_getAccountAddress::testWallet_getAccountAddress() - : initital_account_state_() -{} - -testWallet_getAccountAddress::testWallet_getAccountAddress(object_ptr &&initital_account_state_) - : initital_account_state_(std::move(initital_account_state_)) -{} - -const std::int32_t testWallet_getAccountAddress::ID; - -void testWallet_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testWallet_getAccountAddress"); - if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); } - s.store_class_end(); - } -} - -testWallet_getAccountState::testWallet_getAccountState() - : account_address_() -{} - -testWallet_getAccountState::testWallet_getAccountState(object_ptr &&account_address_) - : account_address_(std::move(account_address_)) -{} - -const std::int32_t testWallet_getAccountState::ID; - -void testWallet_getAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testWallet_getAccountState"); - if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); } - s.store_class_end(); - } -} - -testWallet_init::testWallet_init() - : private_key_() -{} - -testWallet_init::testWallet_init(object_ptr &&private_key_) - : private_key_(std::move(private_key_)) -{} - -const std::int32_t testWallet_init::ID; - -void testWallet_init::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testWallet_init"); - if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } - s.store_class_end(); - } -} - -testWallet_sendGrams::testWallet_sendGrams() - : private_key_() - , destination_() - , seqno_() - , amount_() - , message_() -{} - -testWallet_sendGrams::testWallet_sendGrams(object_ptr &&private_key_, object_ptr &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_) - : private_key_(std::move(private_key_)) - , destination_(std::move(destination_)) - , seqno_(seqno_) - , amount_(amount_) - , message_(std::move(message_)) -{} - -const std::int32_t testWallet_sendGrams::ID; - -void testWallet_sendGrams::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "testWallet_sendGrams"); - if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } - if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); } - s.store_field("seqno", seqno_); - s.store_field("amount", amount_); - s.store_bytes_field("message", message_); - s.store_class_end(); - } -} - unpackAccountAddress::unpackAccountAddress() : account_address_() {} @@ -2416,107 +2908,23 @@ void unpackAccountAddress::store(td::TlStorerToString &s, const char *field_name } } -wallet_getAccountAddress::wallet_getAccountAddress() - : initital_account_state_() +withBlock::withBlock() + : id_() + , function_() {} -wallet_getAccountAddress::wallet_getAccountAddress(object_ptr &&initital_account_state_) - : initital_account_state_(std::move(initital_account_state_)) +withBlock::withBlock(object_ptr &&id_, object_ptr &&function_) + : id_(std::move(id_)) + , function_(std::move(function_)) {} -const std::int32_t wallet_getAccountAddress::ID; +const std::int32_t withBlock::ID; -void wallet_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const { +void withBlock::store(td::TlStorerToString &s, const char *field_name) const { if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_getAccountAddress"); - if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); } - s.store_class_end(); - } -} - -wallet_getAccountState::wallet_getAccountState() - : account_address_() -{} - -wallet_getAccountState::wallet_getAccountState(object_ptr &&account_address_) - : account_address_(std::move(account_address_)) -{} - -const std::int32_t wallet_getAccountState::ID; - -void wallet_getAccountState::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_getAccountState"); - if (account_address_ == nullptr) { s.store_field("account_address", "null"); } else { account_address_->store(s, "account_address"); } - s.store_class_end(); - } -} - -wallet_init::wallet_init() - : private_key_() -{} - -wallet_init::wallet_init(object_ptr &&private_key_) - : private_key_(std::move(private_key_)) -{} - -const std::int32_t wallet_init::ID; - -void wallet_init::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_init"); - if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } - s.store_class_end(); - } -} - -wallet_sendGrams::wallet_sendGrams() - : private_key_() - , destination_() - , seqno_() - , valid_until_() - , amount_() - , message_() -{} - -wallet_sendGrams::wallet_sendGrams(object_ptr &&private_key_, object_ptr &&destination_, std::int32_t seqno_, std::int64_t valid_until_, std::int64_t amount_, std::string const &message_) - : private_key_(std::move(private_key_)) - , destination_(std::move(destination_)) - , seqno_(seqno_) - , valid_until_(valid_until_) - , amount_(amount_) - , message_(std::move(message_)) -{} - -const std::int32_t wallet_sendGrams::ID; - -void wallet_sendGrams::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_sendGrams"); - if (private_key_ == nullptr) { s.store_field("private_key", "null"); } else { private_key_->store(s, "private_key"); } - if (destination_ == nullptr) { s.store_field("destination", "null"); } else { destination_->store(s, "destination"); } - s.store_field("seqno", seqno_); - s.store_field("valid_until", valid_until_); - s.store_field("amount", amount_); - s.store_bytes_field("message", message_); - s.store_class_end(); - } -} - -wallet_v3_getAccountAddress::wallet_v3_getAccountAddress() - : initital_account_state_() -{} - -wallet_v3_getAccountAddress::wallet_v3_getAccountAddress(object_ptr &&initital_account_state_) - : initital_account_state_(std::move(initital_account_state_)) -{} - -const std::int32_t wallet_v3_getAccountAddress::ID; - -void wallet_v3_getAccountAddress::store(td::TlStorerToString &s, const char *field_name) const { - if (!LOG_IS_STRIPPED(ERROR)) { - s.store_class_begin(field_name, "wallet_v3_getAccountAddress"); - if (initital_account_state_ == nullptr) { s.store_field("initital_account_state", "null"); } else { initital_account_state_->store(s, "initital_account_state"); } + s.store_class_begin(field_name, "withBlock"); + if (id_ == nullptr) { s.store_field("id", "null"); } else { id_->store(s, "id"); } + if (function_ == nullptr) { s.store_field("function", "null"); } else { function_->store(s, "function"); } s.store_class_end(); } } diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h index ae90186fea..5247ecddfa 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.h @@ -46,6 +46,14 @@ std::string to_string(const object_ptr &value) { class accountAddress; +class accountRevisionList; + +class AccountState; + +class Action; + +class adnlAddress; + class bip39Hints; class config; @@ -60,8 +68,14 @@ class exportedKey; class exportedPemKey; +class exportedUnencryptedKey; + class fees; +class fullAccountState; + +class InitialAccountState; + class InputKey; class key; @@ -78,29 +92,41 @@ class ok; class options; -class sendGramsResult; - class SyncState; class unpackedAccountAddress; class Update; -class generic_AccountState; +class dns_Action; + +class dns_entry; + +class dns_EntryData; + +class dns_resolved; + +class ton_blockId; class internal_transactionId; class liteServer_info; +class msg_Data; + +class msg_dataArray; + +class msg_message; + class options_configInfo; +class options_info; + class query_fees; class query_info; -class raw_accountState; - -class raw_initialAccountState; +class raw_fullAccountState; class raw_message; @@ -114,29 +140,19 @@ class smc_MethodId; class smc_runResult; -class testGiver_accountState; - -class testWallet_accountState; - -class testWallet_initialAccountState; +class ton_blockIdExt; class tvm_cell; +class tvm_list; + class tvm_numberDecimal; class tvm_slice; class tvm_StackEntry; -class uninited_accountState; - -class wallet_accountState; - -class wallet_initialAccountState; - -class wallet_v3_accountState; - -class wallet_v3_initialAccountState; +class tvm_tuple; class Object; @@ -164,6 +180,240 @@ class accountAddress final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class accountRevisionList final : public Object { + public: + std::vector revisions_; + + accountRevisionList(); + + explicit accountRevisionList(std::vector &&revisions_); + + static const std::int32_t ID = 120583012; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class AccountState: public Object { + public: +}; + +class raw_accountState final : public AccountState { + public: + std::string code_; + std::string data_; + std::string frozen_hash_; + + raw_accountState(); + + raw_accountState(std::string const &code_, std::string const &data_, std::string const &frozen_hash_); + + static const std::int32_t ID = -531917254; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class testWallet_accountState final : public AccountState { + public: + std::int32_t seqno_; + + testWallet_accountState(); + + explicit testWallet_accountState(std::int32_t seqno_); + + static const std::int32_t ID = -2053909931; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_accountState final : public AccountState { + public: + std::int32_t seqno_; + + wallet_accountState(); + + explicit wallet_accountState(std::int32_t seqno_); + + static const std::int32_t ID = -390017192; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_v3_accountState final : public AccountState { + public: + std::int64_t wallet_id_; + std::int32_t seqno_; + + wallet_v3_accountState(); + + wallet_v3_accountState(std::int64_t wallet_id_, std::int32_t seqno_); + + static const std::int32_t ID = -1619351478; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_highload_v1_accountState final : public AccountState { + public: + std::int64_t wallet_id_; + std::int32_t seqno_; + + wallet_highload_v1_accountState(); + + wallet_highload_v1_accountState(std::int64_t wallet_id_, std::int32_t seqno_); + + static const std::int32_t ID = 1616372956; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_highload_v2_accountState final : public AccountState { + public: + std::int64_t wallet_id_; + + wallet_highload_v2_accountState(); + + explicit wallet_highload_v2_accountState(std::int64_t wallet_id_); + + static const std::int32_t ID = -1803723441; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class testGiver_accountState final : public AccountState { + public: + std::int32_t seqno_; + + testGiver_accountState(); + + explicit testGiver_accountState(std::int32_t seqno_); + + static const std::int32_t ID = -696813142; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class dns_accountState final : public AccountState { + public: + std::int64_t wallet_id_; + + dns_accountState(); + + explicit dns_accountState(std::int64_t wallet_id_); + + static const std::int32_t ID = 1727715434; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class uninited_accountState final : public AccountState { + public: + std::string frozen_hash_; + + uninited_accountState(); + + explicit uninited_accountState(std::string const &frozen_hash_); + + static const std::int32_t ID = 1522374408; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class Action: public Object { + public: +}; + +class actionNoop final : public Action { + public: + + actionNoop(); + + static const std::int32_t ID = 1135848603; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class actionMsg final : public Action { + public: + std::vector> messages_; + bool allow_send_to_uninited_; + + actionMsg(); + + actionMsg(std::vector> &&messages_, bool allow_send_to_uninited_); + + static const std::int32_t ID = 246839120; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class actionDns final : public Action { + public: + std::vector> actions_; + + actionDns(); + + explicit actionDns(std::vector> &&actions_); + + static const std::int32_t ID = 1193750561; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class adnlAddress final : public Object { + public: + std::string adnl_address_; + + adnlAddress(); + + explicit adnlAddress(std::string const &adnl_address_); + + static const std::int32_t ID = 70358284; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class bip39Hints final : public Object { public: std::vector words_; @@ -280,6 +530,22 @@ class exportedPemKey final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class exportedUnencryptedKey final : public Object { + public: + td::SecureString data_; + + exportedUnencryptedKey(); + + explicit exportedUnencryptedKey(td::SecureString &&data_); + + static const std::int32_t ID = 730045160; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class fees final : public Object { public: std::int64_t in_fwd_fee_; @@ -299,6 +565,160 @@ class fees final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class fullAccountState final : public Object { + public: + std::int64_t balance_; + object_ptr last_transaction_id_; + object_ptr block_id_; + std::int64_t sync_utime_; + object_ptr account_state_; + + fullAccountState(); + + fullAccountState(std::int64_t balance_, object_ptr &&last_transaction_id_, object_ptr &&block_id_, std::int64_t sync_utime_, object_ptr &&account_state_); + + static const std::int32_t ID = -686286006; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class InitialAccountState: public Object { + public: +}; + +class raw_initialAccountState final : public InitialAccountState { + public: + std::string code_; + std::string data_; + + raw_initialAccountState(); + + raw_initialAccountState(std::string const &code_, std::string const &data_); + + static const std::int32_t ID = -337945529; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class testGiver_initialAccountState final : public InitialAccountState { + public: + + testGiver_initialAccountState(); + + static const std::int32_t ID = -1448412176; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class testWallet_initialAccountState final : public InitialAccountState { + public: + std::string public_key_; + + testWallet_initialAccountState(); + + explicit testWallet_initialAccountState(std::string const &public_key_); + + static const std::int32_t ID = 819380068; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_initialAccountState final : public InitialAccountState { + public: + std::string public_key_; + + wallet_initialAccountState(); + + explicit wallet_initialAccountState(std::string const &public_key_); + + static const std::int32_t ID = -1122166790; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_v3_initialAccountState final : public InitialAccountState { + public: + std::string public_key_; + std::int64_t wallet_id_; + + wallet_v3_initialAccountState(); + + wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_); + + static const std::int32_t ID = -118074048; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_highload_v1_initialAccountState final : public InitialAccountState { + public: + std::string public_key_; + std::int64_t wallet_id_; + + wallet_highload_v1_initialAccountState(); + + wallet_highload_v1_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_); + + static const std::int32_t ID = -327901626; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class wallet_highload_v2_initialAccountState final : public InitialAccountState { + public: + std::string public_key_; + std::int64_t wallet_id_; + + wallet_highload_v2_initialAccountState(); + + wallet_highload_v2_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_); + + static const std::int32_t ID = 1966373161; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class dns_initialAccountState final : public InitialAccountState { + public: + std::string public_key_; + std::int64_t wallet_id_; + + dns_initialAccountState(); + + dns_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_); + + static const std::int32_t ID = 1842062527; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class InputKey: public Object { public: }; @@ -492,23 +912,6 @@ class options final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class sendGramsResult final : public Object { - public: - std::int64_t sent_until_; - std::string body_hash_; - - sendGramsResult(); - - sendGramsResult(std::int64_t sent_until_, std::string const &body_hash_); - - static const std::int32_t ID = 426872238; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - class SyncState: public Object { public: }; @@ -600,19 +1003,16 @@ class updateSyncState final : public Update { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_AccountState: public Object { +class dns_Action: public Object { public: }; -class generic_accountStateRaw final : public generic_AccountState { +class dns_actionDeleteAll final : public dns_Action { public: - object_ptr account_state_; - generic_accountStateRaw(); + dns_actionDeleteAll(); - explicit generic_accountStateRaw(object_ptr &&account_state_); - - static const std::int32_t ID = -1387096685; + static const std::int32_t ID = 1067356318; std::int32_t get_id() const final { return ID; } @@ -620,15 +1020,16 @@ class generic_accountStateRaw final : public generic_AccountState { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_accountStateTestWallet final : public generic_AccountState { +class dns_actionDelete final : public dns_Action { public: - object_ptr account_state_; + std::string name_; + std::int32_t category_; - generic_accountStateTestWallet(); + dns_actionDelete(); - explicit generic_accountStateTestWallet(object_ptr &&account_state_); + dns_actionDelete(std::string const &name_, std::int32_t category_); - static const std::int32_t ID = -1041955397; + static const std::int32_t ID = 775206882; std::int32_t get_id() const final { return ID; } @@ -636,15 +1037,15 @@ class generic_accountStateTestWallet final : public generic_AccountState { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_accountStateWallet final : public generic_AccountState { +class dns_actionSet final : public dns_Action { public: - object_ptr account_state_; + object_ptr entry_; - generic_accountStateWallet(); + dns_actionSet(); - explicit generic_accountStateWallet(object_ptr &&account_state_); + explicit dns_actionSet(object_ptr &&entry_); - static const std::int32_t ID = 942582925; + static const std::int32_t ID = -1374965309; std::int32_t get_id() const final { return ID; } @@ -652,15 +1053,17 @@ class generic_accountStateWallet final : public generic_AccountState { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_accountStateWalletV3 final : public generic_AccountState { +class dns_entry final : public Object { public: - object_ptr account_state_; + std::string name_; + std::int32_t category_; + object_ptr entry_; - generic_accountStateWalletV3(); + dns_entry(); - explicit generic_accountStateWalletV3(object_ptr &&account_state_); + dns_entry(std::string const &name_, std::int32_t category_, object_ptr &&entry_); - static const std::int32_t ID = -281349583; + static const std::int32_t ID = -1842435400; std::int32_t get_id() const final { return ID; } @@ -668,15 +1071,19 @@ class generic_accountStateWalletV3 final : public generic_AccountState { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_accountStateTestGiver final : public generic_AccountState { +class dns_EntryData: public Object { public: - object_ptr account_state_; +}; - generic_accountStateTestGiver(); +class dns_entryDataUnknown final : public dns_EntryData { + public: + std::string bytes_; - explicit generic_accountStateTestGiver(object_ptr &&account_state_); + dns_entryDataUnknown(); - static const std::int32_t ID = 1134654598; + explicit dns_entryDataUnknown(std::string const &bytes_); + + static const std::int32_t ID = -1285893248; std::int32_t get_id() const final { return ID; } @@ -684,15 +1091,97 @@ class generic_accountStateTestGiver final : public generic_AccountState { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_accountStateUninited final : public generic_AccountState { +class dns_entryDataText final : public dns_EntryData { public: - object_ptr account_state_; + std::string text_; - generic_accountStateUninited(); + dns_entryDataText(); - explicit generic_accountStateUninited(object_ptr &&account_state_); + explicit dns_entryDataText(std::string const &text_); - static const std::int32_t ID = -908702008; + static const std::int32_t ID = -792485614; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class dns_entryDataNextResolver final : public dns_EntryData { + public: + object_ptr resolver_; + + dns_entryDataNextResolver(); + + explicit dns_entryDataNextResolver(object_ptr &&resolver_); + + static const std::int32_t ID = 330382792; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class dns_entryDataSmcAddress final : public dns_EntryData { + public: + object_ptr smc_address_; + + dns_entryDataSmcAddress(); + + explicit dns_entryDataSmcAddress(object_ptr &&smc_address_); + + static const std::int32_t ID = -1759937982; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class dns_entryDataAdnlAddress final : public dns_EntryData { + public: + object_ptr adnl_address_; + + dns_entryDataAdnlAddress(); + + explicit dns_entryDataAdnlAddress(object_ptr &&adnl_address_); + + static const std::int32_t ID = -1114064368; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class dns_resolved final : public Object { + public: + std::vector> entries_; + + dns_resolved(); + + explicit dns_resolved(std::vector> &&entries_); + + static const std::int32_t ID = 2090272150; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class ton_blockId final : public Object { + public: + std::int32_t workchain_; + std::int64_t shard_; + std::int32_t seqno_; + + ton_blockId(); + + ton_blockId(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_); + + static const std::int32_t ID = -1185382494; std::int32_t get_id() const final { return ID; } @@ -735,6 +1224,108 @@ class liteServer_info final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class msg_Data: public Object { + public: +}; + +class msg_dataRaw final : public msg_Data { + public: + std::string body_; + + msg_dataRaw(); + + explicit msg_dataRaw(std::string const &body_); + + static const std::int32_t ID = 38878511; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class msg_dataText final : public msg_Data { + public: + std::string text_; + + msg_dataText(); + + explicit msg_dataText(std::string const &text_); + + static const std::int32_t ID = -341560688; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class msg_dataDecryptedText final : public msg_Data { + public: + std::string text_; + + msg_dataDecryptedText(); + + explicit msg_dataDecryptedText(std::string const &text_); + + static const std::int32_t ID = -1289133895; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class msg_dataEncryptedText final : public msg_Data { + public: + std::string text_; + + msg_dataEncryptedText(); + + explicit msg_dataEncryptedText(std::string const &text_); + + static const std::int32_t ID = -296612902; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class msg_dataArray final : public Object { + public: + std::vector> elements_; + + msg_dataArray(); + + explicit msg_dataArray(std::vector> &&elements_); + + static const std::int32_t ID = 1248461374; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class msg_message final : public Object { + public: + object_ptr destination_; + std::int64_t amount_; + object_ptr data_; + + msg_message(); + + msg_message(object_ptr &&destination_, std::int64_t amount_, object_ptr &&data_); + + static const std::int32_t ID = 1349943761; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class options_configInfo final : public Object { public: std::int64_t default_wallet_id_; @@ -743,7 +1334,23 @@ class options_configInfo final : public Object { explicit options_configInfo(std::int64_t default_wallet_id_); - static const std::int32_t ID = 165216422; + static const std::int32_t ID = 451217371; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class options_info final : public Object { + public: + object_ptr config_info_; + + options_info(); + + explicit options_info(object_ptr &&config_info_); + + static const std::int32_t ID = -64676736; std::int32_t get_id() const final { return ID; } @@ -754,13 +1361,13 @@ class options_configInfo final : public Object { class query_fees final : public Object { public: object_ptr source_fees_; - object_ptr destination_fees_; + std::vector> destination_fees_; query_fees(); - query_fees(object_ptr &&source_fees_, object_ptr &&destination_fees_); + query_fees(object_ptr &&source_fees_, std::vector> &&destination_fees_); - static const std::int32_t ID = 725267759; + static const std::int32_t ID = 1614616510; std::int32_t get_id() const final { return ID; } @@ -786,37 +1393,21 @@ class query_info final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class raw_accountState final : public Object { +class raw_fullAccountState final : public Object { public: std::int64_t balance_; std::string code_; std::string data_; object_ptr last_transaction_id_; + object_ptr block_id_; std::string frozen_hash_; std::int64_t sync_utime_; - raw_accountState(); + raw_fullAccountState(); - raw_accountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_); + raw_fullAccountState(std::int64_t balance_, std::string const &code_, std::string const &data_, object_ptr &&last_transaction_id_, object_ptr &&block_id_, std::string const &frozen_hash_, std::int64_t sync_utime_); - static const std::int32_t ID = 1205935434; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class raw_initialAccountState final : public Object { - public: - std::string code_; - std::string data_; - - raw_initialAccountState(); - - raw_initialAccountState(std::string const &code_, std::string const &data_); - - static const std::int32_t ID = 777456197; + static const std::int32_t ID = -1465398385; std::int32_t get_id() const final { return ID; } @@ -833,13 +1424,13 @@ class raw_message final : public Object { std::int64_t ihr_fee_; std::int64_t created_lt_; std::string body_hash_; - std::string message_; + object_ptr msg_data_; raw_message(); - raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, std::string const &message_); + raw_message(std::string const &source_, std::string const &destination_, std::int64_t value_, std::int64_t fwd_fee_, std::int64_t ihr_fee_, std::int64_t created_lt_, std::string const &body_hash_, object_ptr &&msg_data_); - static const std::int32_t ID = -906281442; + static const std::int32_t ID = -32842388; std::int32_t get_id() const final { return ID; } @@ -957,53 +1548,19 @@ class smc_runResult final : public Object { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class testGiver_accountState final : public Object { +class ton_blockIdExt final : public Object { public: - std::int64_t balance_; + std::int32_t workchain_; + std::int64_t shard_; std::int32_t seqno_; - object_ptr last_transaction_id_; - std::int64_t sync_utime_; + std::string root_hash_; + std::string file_hash_; - testGiver_accountState(); + ton_blockIdExt(); - testGiver_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_); + ton_blockIdExt(std::int32_t workchain_, std::int64_t shard_, std::int32_t seqno_, std::string const &root_hash_, std::string const &file_hash_); - static const std::int32_t ID = 860930426; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testWallet_accountState final : public Object { - public: - std::int64_t balance_; - std::int32_t seqno_; - object_ptr last_transaction_id_; - std::int64_t sync_utime_; - - testWallet_accountState(); - - testWallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_); - - static const std::int32_t ID = 305698744; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testWallet_initialAccountState final : public Object { - public: - std::string public_key_; - - testWallet_initialAccountState(); - - explicit testWallet_initialAccountState(std::string const &public_key_); - - static const std::int32_t ID = -1231516227; + static const std::int32_t ID = 2031156378; std::int32_t get_id() const final { return ID; } @@ -1019,7 +1576,23 @@ class tvm_cell final : public Object { explicit tvm_cell(std::string const &bytes_); - static const std::int32_t ID = -859530316; + static const std::int32_t ID = -413424735; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class tvm_list final : public Object { + public: + std::vector> elements_; + + tvm_list(); + + explicit tvm_list(std::vector> &&elements_); + + static const std::int32_t ID = 1270320392; std::int32_t get_id() const final { return ID; } @@ -1051,7 +1624,7 @@ class tvm_slice final : public Object { explicit tvm_slice(std::string const &bytes_); - static const std::int32_t ID = -1069968387; + static const std::int32_t ID = 537299687; std::int32_t get_id() const final { return ID; } @@ -1111,6 +1684,38 @@ class tvm_stackEntryNumber final : public tvm_StackEntry { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class tvm_stackEntryTuple final : public tvm_StackEntry { + public: + object_ptr tuple_; + + tvm_stackEntryTuple(); + + explicit tvm_stackEntryTuple(object_ptr &&tuple_); + + static const std::int32_t ID = -157391908; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class tvm_stackEntryList final : public tvm_StackEntry { + public: + object_ptr list_; + + tvm_stackEntryList(); + + explicit tvm_stackEntryList(object_ptr &&list_); + + static const std::int32_t ID = -1186714229; + std::int32_t get_id() const final { + return ID; + } + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class tvm_stackEntryUnsupported final : public tvm_StackEntry { public: @@ -1124,90 +1729,15 @@ class tvm_stackEntryUnsupported final : public tvm_StackEntry { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class uninited_accountState final : public Object { +class tvm_tuple final : public Object { public: - std::int64_t balance_; - object_ptr last_transaction_id_; - std::string frozen_hash_; - std::int64_t sync_utime_; + std::vector> elements_; - uninited_accountState(); + tvm_tuple(); - uninited_accountState(std::int64_t balance_, object_ptr &&last_transaction_id_, std::string const &frozen_hash_, std::int64_t sync_utime_); + explicit tvm_tuple(std::vector> &&elements_); - static const std::int32_t ID = -918880075; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_accountState final : public Object { - public: - std::int64_t balance_; - std::int32_t seqno_; - object_ptr last_transaction_id_; - std::int64_t sync_utime_; - - wallet_accountState(); - - wallet_accountState(std::int64_t balance_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_); - - static const std::int32_t ID = -1919815977; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_initialAccountState final : public Object { - public: - std::string public_key_; - - wallet_initialAccountState(); - - explicit wallet_initialAccountState(std::string const &public_key_); - - static const std::int32_t ID = -1079249978; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_v3_accountState final : public Object { - public: - std::int64_t balance_; - std::int64_t wallet_id_; - std::int32_t seqno_; - object_ptr last_transaction_id_; - std::int64_t sync_utime_; - - wallet_v3_accountState(); - - wallet_v3_accountState(std::int64_t balance_, std::int64_t wallet_id_, std::int32_t seqno_, object_ptr &&last_transaction_id_, std::int64_t sync_utime_); - - static const std::int32_t ID = 1977698154; - std::int32_t get_id() const final { - return ID; - } - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_v3_initialAccountState final : public Object { - public: - std::string public_key_; - std::int64_t wallet_id_; - - wallet_v3_initialAccountState(); - - wallet_v3_initialAccountState(std::string const &public_key_, std::int64_t wallet_id_); - - static const std::int32_t ID = 283460879; + static const std::int32_t ID = -1363953053; std::int32_t get_id() const final { return ID; } @@ -1288,6 +1818,27 @@ class createNewKey final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class createQuery final : public Function { + public: + object_ptr private_key_; + object_ptr address_; + std::int32_t timeout_; + object_ptr action_; + + createQuery(); + + createQuery(object_ptr &&private_key_, object_ptr &&address_, std::int32_t timeout_, object_ptr &&action_); + + static const std::int32_t ID = -1316835098; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class decrypt final : public Function { public: td::SecureString encrypted_data_; @@ -1340,6 +1891,27 @@ class deleteKey final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class dns_resolve final : public Function { + public: + object_ptr account_address_; + std::string name_; + std::int32_t category_; + std::int32_t ttl_; + + dns_resolve(); + + dns_resolve(object_ptr &&account_address_, std::string const &name_, std::int32_t category_, std::int32_t ttl_); + + static const std::int32_t ID = -149238065; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class encrypt final : public Function { public: td::SecureString decrypted_data_; @@ -1415,68 +1987,57 @@ class exportPemKey final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_createSendGramsQuery final : public Function { +class exportUnencryptedKey final : public Function { public: - object_ptr private_key_; - object_ptr source_; - object_ptr destination_; - std::int64_t amount_; - std::int32_t timeout_; - bool allow_send_to_uninited_; - std::string message_; + object_ptr input_key_; - generic_createSendGramsQuery(); + exportUnencryptedKey(); - generic_createSendGramsQuery(object_ptr &&private_key_, object_ptr &&source_, object_ptr &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_); + explicit exportUnencryptedKey(object_ptr &&input_key_); - static const std::int32_t ID = 208206338; + static const std::int32_t ID = -634665152; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; -class generic_getAccountState final : public Function { +class getAccountAddress final : public Function { + public: + object_ptr initial_account_state_; + std::int32_t revision_; + + getAccountAddress(); + + getAccountAddress(object_ptr &&initial_account_state_, std::int32_t revision_); + + static const std::int32_t ID = -1159101819; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + +class getAccountState final : public Function { public: object_ptr account_address_; - generic_getAccountState(); + getAccountState(); - explicit generic_getAccountState(object_ptr &&account_address_); + explicit getAccountState(object_ptr &&account_address_); - static const std::int32_t ID = -657000446; + static const std::int32_t ID = -2116357050; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class generic_sendGrams final : public Function { - public: - object_ptr private_key_; - object_ptr source_; - object_ptr destination_; - std::int64_t amount_; - std::int32_t timeout_; - bool allow_send_to_uninited_; - std::string message_; - - generic_sendGrams(); - - generic_sendGrams(object_ptr &&private_key_, object_ptr &&source_, object_ptr &&destination_, std::int64_t amount_, std::int32_t timeout_, bool allow_send_to_uninited_, std::string const &message_); - - static const std::int32_t ID = -553513162; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; @@ -1562,6 +2123,24 @@ class getLogVerbosityLevel final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class guessAccountRevision final : public Function { + public: + object_ptr initial_account_state_; + + guessAccountRevision(); + + explicit guessAccountRevision(object_ptr &&initial_account_state_); + + static const std::int32_t ID = 1463344293; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class importEncryptedKey final : public Function { public: td::SecureString local_password_; @@ -1622,6 +2201,25 @@ class importPemKey final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class importUnencryptedKey final : public Function { + public: + td::SecureString local_password_; + object_ptr exported_unencrypted_key_; + + importUnencryptedKey(); + + importUnencryptedKey(td::SecureString &&local_password_, object_ptr &&exported_unencrypted_key_); + + static const std::int32_t ID = -1184671467; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class init final : public Function { public: object_ptr options_; @@ -1630,12 +2228,12 @@ class init final : public Function { explicit init(object_ptr &&options_); - static const std::int32_t ID = -2014661877; + static const std::int32_t ID = -1000594762; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; @@ -1675,6 +2273,25 @@ class liteServer_getInfo final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; +class msg_decrypt final : public Function { + public: + object_ptr input_key_; + object_ptr data_; + + msg_decrypt(); + + msg_decrypt(object_ptr &&input_key_, object_ptr &&data_); + + static const std::int32_t ID = 1131086633; + std::int32_t get_id() const final { + return ID; + } + + using ReturnType = object_ptr; + + void store(td::TlStorerToString &s, const char *field_name) const final; +}; + class onLiteServerQueryError final : public Function { public: std::int64_t id_; @@ -1721,12 +2338,12 @@ class options_setConfig final : public Function { explicit options_setConfig(object_ptr &&config_); - static const std::int32_t ID = 646497241; + static const std::int32_t ID = 1870064579; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; @@ -1881,24 +2498,6 @@ class raw_createQuery final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class raw_getAccountAddress final : public Function { - public: - object_ptr initital_account_state_; - - raw_getAccountAddress(); - - explicit raw_getAccountAddress(object_ptr &&initital_account_state_); - - static const std::int32_t ID = -521283849; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - class raw_getAccountState final : public Function { public: object_ptr account_address_; @@ -1907,26 +2506,27 @@ class raw_getAccountState final : public Function { explicit raw_getAccountState(object_ptr &&account_address_); - static const std::int32_t ID = 663706721; + static const std::int32_t ID = -1327847118; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; class raw_getTransactions final : public Function { public: + object_ptr private_key_; object_ptr account_address_; object_ptr from_transaction_id_; raw_getTransactions(); - raw_getTransactions(object_ptr &&account_address_, object_ptr &&from_transaction_id_); + raw_getTransactions(object_ptr &&private_key_, object_ptr &&account_address_, object_ptr &&from_transaction_id_); - static const std::int32_t ID = 935377269; + static const std::int32_t ID = 1029612317; std::int32_t get_id() const final { return ID; } @@ -2124,139 +2724,12 @@ class sync final : public Function { sync(); - static const std::int32_t ID = -1617065525; + static const std::int32_t ID = -1875977070; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testGiver_getAccountAddress final : public Function { - public: - - testGiver_getAccountAddress(); - - static const std::int32_t ID = -540100768; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testGiver_getAccountState final : public Function { - public: - - testGiver_getAccountState(); - - static const std::int32_t ID = 267738275; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testGiver_sendGrams final : public Function { - public: - object_ptr destination_; - std::int32_t seqno_; - std::int64_t amount_; - std::string message_; - - testGiver_sendGrams(); - - testGiver_sendGrams(object_ptr &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_); - - static const std::int32_t ID = -1785750375; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testWallet_getAccountAddress final : public Function { - public: - object_ptr initital_account_state_; - - testWallet_getAccountAddress(); - - explicit testWallet_getAccountAddress(object_ptr &&initital_account_state_); - - static const std::int32_t ID = -1557748223; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testWallet_getAccountState final : public Function { - public: - object_ptr account_address_; - - testWallet_getAccountState(); - - explicit testWallet_getAccountState(object_ptr &&account_address_); - - static const std::int32_t ID = 654082364; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testWallet_init final : public Function { - public: - object_ptr private_key_; - - testWallet_init(); - - explicit testWallet_init(object_ptr &&private_key_); - - static const std::int32_t ID = -1417409140; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class testWallet_sendGrams final : public Function { - public: - object_ptr private_key_; - object_ptr destination_; - std::int32_t seqno_; - std::int64_t amount_; - std::string message_; - - testWallet_sendGrams(); - - testWallet_sendGrams(object_ptr &&private_key_, object_ptr &&destination_, std::int32_t seqno_, std::int64_t amount_, std::string const &message_); - - static const std::int32_t ID = 573748322; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; @@ -2279,97 +2752,21 @@ class unpackAccountAddress final : public Function { void store(td::TlStorerToString &s, const char *field_name) const final; }; -class wallet_getAccountAddress final : public Function { +class withBlock final : public Function { public: - object_ptr initital_account_state_; + object_ptr id_; + object_ptr function_; - wallet_getAccountAddress(); + withBlock(); - explicit wallet_getAccountAddress(object_ptr &&initital_account_state_); + withBlock(object_ptr &&id_, object_ptr &&function_); - static const std::int32_t ID = -1004103180; + static const std::int32_t ID = -789093723; std::int32_t get_id() const final { return ID; } - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_getAccountState final : public Function { - public: - object_ptr account_address_; - - wallet_getAccountState(); - - explicit wallet_getAccountState(object_ptr &&account_address_); - - static const std::int32_t ID = 462294850; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_init final : public Function { - public: - object_ptr private_key_; - - wallet_init(); - - explicit wallet_init(object_ptr &&private_key_); - - static const std::int32_t ID = -395706309; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_sendGrams final : public Function { - public: - object_ptr private_key_; - object_ptr destination_; - std::int32_t seqno_; - std::int64_t valid_until_; - std::int64_t amount_; - std::string message_; - - wallet_sendGrams(); - - wallet_sendGrams(object_ptr &&private_key_, object_ptr &&destination_, std::int32_t seqno_, std::int64_t valid_until_, std::int64_t amount_, std::string const &message_); - - static const std::int32_t ID = 297317621; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; - - void store(td::TlStorerToString &s, const char *field_name) const final; -}; - -class wallet_v3_getAccountAddress final : public Function { - public: - object_ptr initital_account_state_; - - wallet_v3_getAccountAddress(); - - explicit wallet_v3_getAccountAddress(object_ptr &&initital_account_state_); - - static const std::int32_t ID = 1011655671; - std::int32_t get_id() const final { - return ID; - } - - using ReturnType = object_ptr; + using ReturnType = object_ptr; void store(td::TlStorerToString &s, const char *field_name) const final; }; diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp index f82b020a0d..ad2ac76a43 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api.hpp @@ -17,6 +17,48 @@ bool downcast_call(Object &obj, const T &func) { case accountAddress::ID: func(static_cast(obj)); return true; + case accountRevisionList::ID: + func(static_cast(obj)); + return true; + case raw_accountState::ID: + func(static_cast(obj)); + return true; + case testWallet_accountState::ID: + func(static_cast(obj)); + return true; + case wallet_accountState::ID: + func(static_cast(obj)); + return true; + case wallet_v3_accountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v1_accountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v2_accountState::ID: + func(static_cast(obj)); + return true; + case testGiver_accountState::ID: + func(static_cast(obj)); + return true; + case dns_accountState::ID: + func(static_cast(obj)); + return true; + case uninited_accountState::ID: + func(static_cast(obj)); + return true; + case actionNoop::ID: + func(static_cast(obj)); + return true; + case actionMsg::ID: + func(static_cast(obj)); + return true; + case actionDns::ID: + func(static_cast(obj)); + return true; + case adnlAddress::ID: + func(static_cast(obj)); + return true; case bip39Hints::ID: func(static_cast(obj)); return true; @@ -38,9 +80,39 @@ bool downcast_call(Object &obj, const T &func) { case exportedPemKey::ID: func(static_cast(obj)); return true; + case exportedUnencryptedKey::ID: + func(static_cast(obj)); + return true; case fees::ID: func(static_cast(obj)); return true; + case fullAccountState::ID: + func(static_cast(obj)); + return true; + case raw_initialAccountState::ID: + func(static_cast(obj)); + return true; + case testGiver_initialAccountState::ID: + func(static_cast(obj)); + return true; + case testWallet_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_v3_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v1_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v2_initialAccountState::ID: + func(static_cast(obj)); + return true; + case dns_initialAccountState::ID: + func(static_cast(obj)); + return true; case inputKeyRegular::ID: func(static_cast(obj)); return true; @@ -77,9 +149,6 @@ bool downcast_call(Object &obj, const T &func) { case options::ID: func(static_cast(obj)); return true; - case sendGramsResult::ID: - func(static_cast(obj)); - return true; case syncStateDone::ID: func(static_cast(obj)); return true; @@ -95,23 +164,38 @@ bool downcast_call(Object &obj, const T &func) { case updateSyncState::ID: func(static_cast(obj)); return true; - case generic_accountStateRaw::ID: - func(static_cast(obj)); + case dns_actionDeleteAll::ID: + func(static_cast(obj)); return true; - case generic_accountStateTestWallet::ID: - func(static_cast(obj)); + case dns_actionDelete::ID: + func(static_cast(obj)); return true; - case generic_accountStateWallet::ID: - func(static_cast(obj)); + case dns_actionSet::ID: + func(static_cast(obj)); return true; - case generic_accountStateWalletV3::ID: - func(static_cast(obj)); + case dns_entry::ID: + func(static_cast(obj)); return true; - case generic_accountStateTestGiver::ID: - func(static_cast(obj)); + case dns_entryDataUnknown::ID: + func(static_cast(obj)); return true; - case generic_accountStateUninited::ID: - func(static_cast(obj)); + case dns_entryDataText::ID: + func(static_cast(obj)); + return true; + case dns_entryDataNextResolver::ID: + func(static_cast(obj)); + return true; + case dns_entryDataSmcAddress::ID: + func(static_cast(obj)); + return true; + case dns_entryDataAdnlAddress::ID: + func(static_cast(obj)); + return true; + case dns_resolved::ID: + func(static_cast(obj)); + return true; + case ton_blockId::ID: + func(static_cast(obj)); return true; case internal_transactionId::ID: func(static_cast(obj)); @@ -119,20 +203,38 @@ bool downcast_call(Object &obj, const T &func) { case liteServer_info::ID: func(static_cast(obj)); return true; + case msg_dataRaw::ID: + func(static_cast(obj)); + return true; + case msg_dataText::ID: + func(static_cast(obj)); + return true; + case msg_dataDecryptedText::ID: + func(static_cast(obj)); + return true; + case msg_dataEncryptedText::ID: + func(static_cast(obj)); + return true; + case msg_dataArray::ID: + func(static_cast(obj)); + return true; + case msg_message::ID: + func(static_cast(obj)); + return true; case options_configInfo::ID: func(static_cast(obj)); return true; + case options_info::ID: + func(static_cast(obj)); + return true; case query_fees::ID: func(static_cast(obj)); return true; case query_info::ID: func(static_cast(obj)); return true; - case raw_accountState::ID: - func(static_cast(obj)); - return true; - case raw_initialAccountState::ID: - func(static_cast(obj)); + case raw_fullAccountState::ID: + func(static_cast(obj)); return true; case raw_message::ID: func(static_cast(obj)); @@ -155,18 +257,15 @@ bool downcast_call(Object &obj, const T &func) { case smc_runResult::ID: func(static_cast(obj)); return true; - case testGiver_accountState::ID: - func(static_cast(obj)); - return true; - case testWallet_accountState::ID: - func(static_cast(obj)); - return true; - case testWallet_initialAccountState::ID: - func(static_cast(obj)); + case ton_blockIdExt::ID: + func(static_cast(obj)); return true; case tvm_cell::ID: func(static_cast(obj)); return true; + case tvm_list::ID: + func(static_cast(obj)); + return true; case tvm_numberDecimal::ID: func(static_cast(obj)); return true; @@ -182,23 +281,17 @@ bool downcast_call(Object &obj, const T &func) { case tvm_stackEntryNumber::ID: func(static_cast(obj)); return true; + case tvm_stackEntryTuple::ID: + func(static_cast(obj)); + return true; + case tvm_stackEntryList::ID: + func(static_cast(obj)); + return true; case tvm_stackEntryUnsupported::ID: func(static_cast(obj)); return true; - case uninited_accountState::ID: - func(static_cast(obj)); - return true; - case wallet_accountState::ID: - func(static_cast(obj)); - return true; - case wallet_initialAccountState::ID: - func(static_cast(obj)); - return true; - case wallet_v3_accountState::ID: - func(static_cast(obj)); - return true; - case wallet_v3_initialAccountState::ID: - func(static_cast(obj)); + case tvm_tuple::ID: + func(static_cast(obj)); return true; default: return false; @@ -226,6 +319,9 @@ bool downcast_call(Function &obj, const T &func) { case createNewKey::ID: func(static_cast(obj)); return true; + case createQuery::ID: + func(static_cast(obj)); + return true; case decrypt::ID: func(static_cast(obj)); return true; @@ -235,6 +331,9 @@ bool downcast_call(Function &obj, const T &func) { case deleteKey::ID: func(static_cast(obj)); return true; + case dns_resolve::ID: + func(static_cast(obj)); + return true; case encrypt::ID: func(static_cast(obj)); return true; @@ -247,14 +346,14 @@ bool downcast_call(Function &obj, const T &func) { case exportPemKey::ID: func(static_cast(obj)); return true; - case generic_createSendGramsQuery::ID: - func(static_cast(obj)); + case exportUnencryptedKey::ID: + func(static_cast(obj)); return true; - case generic_getAccountState::ID: - func(static_cast(obj)); + case getAccountAddress::ID: + func(static_cast(obj)); return true; - case generic_sendGrams::ID: - func(static_cast(obj)); + case getAccountState::ID: + func(static_cast(obj)); return true; case getBip39Hints::ID: func(static_cast(obj)); @@ -271,6 +370,9 @@ bool downcast_call(Function &obj, const T &func) { case getLogVerbosityLevel::ID: func(static_cast(obj)); return true; + case guessAccountRevision::ID: + func(static_cast(obj)); + return true; case importEncryptedKey::ID: func(static_cast(obj)); return true; @@ -280,6 +382,9 @@ bool downcast_call(Function &obj, const T &func) { case importPemKey::ID: func(static_cast(obj)); return true; + case importUnencryptedKey::ID: + func(static_cast(obj)); + return true; case init::ID: func(static_cast(obj)); return true; @@ -289,6 +394,9 @@ bool downcast_call(Function &obj, const T &func) { case liteServer_getInfo::ID: func(static_cast(obj)); return true; + case msg_decrypt::ID: + func(static_cast(obj)); + return true; case onLiteServerQueryError::ID: func(static_cast(obj)); return true; @@ -322,9 +430,6 @@ bool downcast_call(Function &obj, const T &func) { case raw_createQuery::ID: func(static_cast(obj)); return true; - case raw_getAccountAddress::ID: - func(static_cast(obj)); - return true; case raw_getAccountState::ID: func(static_cast(obj)); return true; @@ -364,44 +469,113 @@ bool downcast_call(Function &obj, const T &func) { case sync::ID: func(static_cast(obj)); return true; - case testGiver_getAccountAddress::ID: - func(static_cast(obj)); - return true; - case testGiver_getAccountState::ID: - func(static_cast(obj)); - return true; - case testGiver_sendGrams::ID: - func(static_cast(obj)); - return true; - case testWallet_getAccountAddress::ID: - func(static_cast(obj)); - return true; - case testWallet_getAccountState::ID: - func(static_cast(obj)); - return true; - case testWallet_init::ID: - func(static_cast(obj)); - return true; - case testWallet_sendGrams::ID: - func(static_cast(obj)); - return true; case unpackAccountAddress::ID: func(static_cast(obj)); return true; - case wallet_getAccountAddress::ID: - func(static_cast(obj)); + case withBlock::ID: + func(static_cast(obj)); return true; - case wallet_getAccountState::ID: - func(static_cast(obj)); + default: + return false; + } +} + +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(AccountState &obj, const T &func) { + switch (obj.get_id()) { + case raw_accountState::ID: + func(static_cast(obj)); return true; - case wallet_init::ID: - func(static_cast(obj)); + case testWallet_accountState::ID: + func(static_cast(obj)); return true; - case wallet_sendGrams::ID: - func(static_cast(obj)); + case wallet_accountState::ID: + func(static_cast(obj)); return true; - case wallet_v3_getAccountAddress::ID: - func(static_cast(obj)); + case wallet_v3_accountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v1_accountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v2_accountState::ID: + func(static_cast(obj)); + return true; + case testGiver_accountState::ID: + func(static_cast(obj)); + return true; + case dns_accountState::ID: + func(static_cast(obj)); + return true; + case uninited_accountState::ID: + func(static_cast(obj)); + return true; + default: + return false; + } +} + +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(Action &obj, const T &func) { + switch (obj.get_id()) { + case actionNoop::ID: + func(static_cast(obj)); + return true; + case actionMsg::ID: + func(static_cast(obj)); + return true; + case actionDns::ID: + func(static_cast(obj)); + return true; + default: + return false; + } +} + +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(InitialAccountState &obj, const T &func) { + switch (obj.get_id()) { + case raw_initialAccountState::ID: + func(static_cast(obj)); + return true; + case testGiver_initialAccountState::ID: + func(static_cast(obj)); + return true; + case testWallet_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_v3_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v1_initialAccountState::ID: + func(static_cast(obj)); + return true; + case wallet_highload_v2_initialAccountState::ID: + func(static_cast(obj)); + return true; + case dns_initialAccountState::ID: + func(static_cast(obj)); return true; default: return false; @@ -518,25 +692,71 @@ bool downcast_call(Update &obj, const T &func) { * \returns whether function object call has happened. Should always return true for correct parameters. */ template -bool downcast_call(generic_AccountState &obj, const T &func) { +bool downcast_call(dns_Action &obj, const T &func) { switch (obj.get_id()) { - case generic_accountStateRaw::ID: - func(static_cast(obj)); + case dns_actionDeleteAll::ID: + func(static_cast(obj)); return true; - case generic_accountStateTestWallet::ID: - func(static_cast(obj)); + case dns_actionDelete::ID: + func(static_cast(obj)); return true; - case generic_accountStateWallet::ID: - func(static_cast(obj)); + case dns_actionSet::ID: + func(static_cast(obj)); return true; - case generic_accountStateWalletV3::ID: - func(static_cast(obj)); + default: + return false; + } +} + +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(dns_EntryData &obj, const T &func) { + switch (obj.get_id()) { + case dns_entryDataUnknown::ID: + func(static_cast(obj)); return true; - case generic_accountStateTestGiver::ID: - func(static_cast(obj)); + case dns_entryDataText::ID: + func(static_cast(obj)); return true; - case generic_accountStateUninited::ID: - func(static_cast(obj)); + case dns_entryDataNextResolver::ID: + func(static_cast(obj)); + return true; + case dns_entryDataSmcAddress::ID: + func(static_cast(obj)); + return true; + case dns_entryDataAdnlAddress::ID: + func(static_cast(obj)); + return true; + default: + return false; + } +} + +/** + * Calls specified function object with the specified object downcasted to the most-derived type. + * \param[in] obj Object to pass as an argument to the function object. + * \param[in] func Function object to which the object will be passed. + * \returns whether function object call has happened. Should always return true for correct parameters. + */ +template +bool downcast_call(msg_Data &obj, const T &func) { + switch (obj.get_id()) { + case msg_dataRaw::ID: + func(static_cast(obj)); + return true; + case msg_dataText::ID: + func(static_cast(obj)); + return true; + case msg_dataDecryptedText::ID: + func(static_cast(obj)); + return true; + case msg_dataEncryptedText::ID: + func(static_cast(obj)); return true; default: return false; @@ -581,6 +801,12 @@ bool downcast_call(tvm_StackEntry &obj, const T &func) { case tvm_stackEntryNumber::ID: func(static_cast(obj)); return true; + case tvm_stackEntryTuple::ID: + func(static_cast(obj)); + return true; + case tvm_stackEntryList::ID: + func(static_cast(obj)); + return true; case tvm_stackEntryUnsupported::ID: func(static_cast(obj)); return true; diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp index bb29637762..335cbbc3d5 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.cpp @@ -14,6 +14,53 @@ namespace ton { namespace tonlib_api{ using namespace td; +Result tl_constructor_from_string(tonlib_api::AccountState *object, const std::string &str) { + static const std::unordered_map m = { + {"raw.accountState", -531917254}, + {"testWallet.accountState", -2053909931}, + {"wallet.accountState", -390017192}, + {"wallet.v3.accountState", -1619351478}, + {"wallet.highload.v1.accountState", 1616372956}, + {"wallet.highload.v2.accountState", -1803723441}, + {"testGiver.accountState", -696813142}, + {"dns.accountState", 1727715434}, + {"uninited.accountState", 1522374408} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} +Result tl_constructor_from_string(tonlib_api::Action *object, const std::string &str) { + static const std::unordered_map m = { + {"actionNoop", 1135848603}, + {"actionMsg", 246839120}, + {"actionDns", 1193750561} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} +Result tl_constructor_from_string(tonlib_api::InitialAccountState *object, const std::string &str) { + static const std::unordered_map m = { + {"raw.initialAccountState", -337945529}, + {"testGiver.initialAccountState", -1448412176}, + {"testWallet.initialAccountState", 819380068}, + {"wallet.initialAccountState", -1122166790}, + {"wallet.v3.initialAccountState", -118074048}, + {"wallet.highload.v1.initialAccountState", -327901626}, + {"wallet.highload.v2.initialAccountState", 1966373161}, + {"dns.initialAccountState", 1842062527} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} Result tl_constructor_from_string(tonlib_api::InputKey *object, const std::string &str) { static const std::unordered_map m = { {"inputKeyRegular", -555399522}, @@ -70,14 +117,38 @@ Result tl_constructor_from_string(tonlib_api::Update *object, const std:: } return it->second; } -Result tl_constructor_from_string(tonlib_api::generic_AccountState *object, const std::string &str) { +Result tl_constructor_from_string(tonlib_api::dns_Action *object, const std::string &str) { static const std::unordered_map m = { - {"generic.accountStateRaw", -1387096685}, - {"generic.accountStateTestWallet", -1041955397}, - {"generic.accountStateWallet", 942582925}, - {"generic.accountStateWalletV3", -281349583}, - {"generic.accountStateTestGiver", 1134654598}, - {"generic.accountStateUninited", -908702008} + {"dns.actionDeleteAll", 1067356318}, + {"dns.actionDelete", 775206882}, + {"dns.actionSet", -1374965309} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} +Result tl_constructor_from_string(tonlib_api::dns_EntryData *object, const std::string &str) { + static const std::unordered_map m = { + {"dns.entryDataUnknown", -1285893248}, + {"dns.entryDataText", -792485614}, + {"dns.entryDataNextResolver", 330382792}, + {"dns.entryDataSmcAddress", -1759937982}, + {"dns.entryDataAdnlAddress", -1114064368} + }; + auto it = m.find(str); + if (it == m.end()) { + return Status::Error(str + "Unknown class"); + } + return it->second; +} +Result tl_constructor_from_string(tonlib_api::msg_Data *object, const std::string &str) { + static const std::unordered_map m = { + {"msg.dataRaw", 38878511}, + {"msg.dataText", -341560688}, + {"msg.dataDecryptedText", -1289133895}, + {"msg.dataEncryptedText", -296612902} }; auto it = m.find(str); if (it == m.end()) { @@ -101,6 +172,8 @@ Result tl_constructor_from_string(tonlib_api::tvm_StackEntry *object, con {"tvm.stackEntrySlice", 1395485477}, {"tvm.stackEntryCell", 1303473952}, {"tvm.stackEntryNumber", 1358642622}, + {"tvm.stackEntryTuple", -157391908}, + {"tvm.stackEntryList", -1186714229}, {"tvm.stackEntryUnsupported", 378880498} }; auto it = m.find(str); @@ -112,6 +185,20 @@ Result tl_constructor_from_string(tonlib_api::tvm_StackEntry *object, con Result tl_constructor_from_string(tonlib_api::Object *object, const std::string &str) { static const std::unordered_map m = { {"accountAddress", 755613099}, + {"accountRevisionList", 120583012}, + {"raw.accountState", -531917254}, + {"testWallet.accountState", -2053909931}, + {"wallet.accountState", -390017192}, + {"wallet.v3.accountState", -1619351478}, + {"wallet.highload.v1.accountState", 1616372956}, + {"wallet.highload.v2.accountState", -1803723441}, + {"testGiver.accountState", -696813142}, + {"dns.accountState", 1727715434}, + {"uninited.accountState", 1522374408}, + {"actionNoop", 1135848603}, + {"actionMsg", 246839120}, + {"actionDns", 1193750561}, + {"adnlAddress", 70358284}, {"bip39Hints", 1012243456}, {"config", -1538391496}, {"data", -414733967}, @@ -119,7 +206,17 @@ Result tl_constructor_from_string(tonlib_api::Object *object, const std:: {"exportedEncryptedKey", 2024406612}, {"exportedKey", -1449248297}, {"exportedPemKey", 1425473725}, + {"exportedUnencryptedKey", 730045160}, {"fees", 1676273340}, + {"fullAccountState", -686286006}, + {"raw.initialAccountState", -337945529}, + {"testGiver.initialAccountState", -1448412176}, + {"testWallet.initialAccountState", 819380068}, + {"wallet.initialAccountState", -1122166790}, + {"wallet.v3.initialAccountState", -118074048}, + {"wallet.highload.v1.initialAccountState", -327901626}, + {"wallet.highload.v2.initialAccountState", 1966373161}, + {"dns.initialAccountState", 1842062527}, {"inputKeyRegular", -555399522}, {"inputKeyFake", -1074054722}, {"key", -1978362923}, @@ -132,47 +229,54 @@ Result tl_constructor_from_string(tonlib_api::Object *object, const std:: {"logVerbosityLevel", 1734624234}, {"ok", -722616727}, {"options", -1924388359}, - {"sendGramsResult", 426872238}, {"syncStateDone", 1408448777}, {"syncStateInProgress", 107726023}, {"unpackedAccountAddress", 1892946998}, {"updateSendLiteServerQuery", -1555130916}, {"updateSyncState", 1204298718}, - {"generic.accountStateRaw", -1387096685}, - {"generic.accountStateTestWallet", -1041955397}, - {"generic.accountStateWallet", 942582925}, - {"generic.accountStateWalletV3", -281349583}, - {"generic.accountStateTestGiver", 1134654598}, - {"generic.accountStateUninited", -908702008}, + {"dns.actionDeleteAll", 1067356318}, + {"dns.actionDelete", 775206882}, + {"dns.actionSet", -1374965309}, + {"dns.entry", -1842435400}, + {"dns.entryDataUnknown", -1285893248}, + {"dns.entryDataText", -792485614}, + {"dns.entryDataNextResolver", 330382792}, + {"dns.entryDataSmcAddress", -1759937982}, + {"dns.entryDataAdnlAddress", -1114064368}, + {"dns.resolved", 2090272150}, + {"ton.blockId", -1185382494}, {"internal.transactionId", -989527262}, {"liteServer.info", -1250165133}, - {"options.configInfo", 165216422}, - {"query.fees", 725267759}, + {"msg.dataRaw", 38878511}, + {"msg.dataText", -341560688}, + {"msg.dataDecryptedText", -1289133895}, + {"msg.dataEncryptedText", -296612902}, + {"msg.dataArray", 1248461374}, + {"msg.message", 1349943761}, + {"options.configInfo", 451217371}, + {"options.info", -64676736}, + {"query.fees", 1614616510}, {"query.info", 1588635915}, - {"raw.accountState", 1205935434}, - {"raw.initialAccountState", 777456197}, - {"raw.message", -906281442}, + {"raw.fullAccountState", -1465398385}, + {"raw.message", -32842388}, {"raw.transaction", 1887601793}, {"raw.transactions", -2063931155}, {"smc.info", 1134270012}, {"smc.methodIdNumber", -1541162500}, {"smc.methodIdName", -249036908}, {"smc.runResult", 1413805043}, - {"testGiver.accountState", 860930426}, - {"testWallet.accountState", 305698744}, - {"testWallet.initialAccountState", -1231516227}, - {"tvm.cell", -859530316}, + {"ton.blockIdExt", 2031156378}, + {"tvm.cell", -413424735}, + {"tvm.list", 1270320392}, {"tvm.numberDecimal", 1172477619}, - {"tvm.slice", -1069968387}, + {"tvm.slice", 537299687}, {"tvm.stackEntrySlice", 1395485477}, {"tvm.stackEntryCell", 1303473952}, {"tvm.stackEntryNumber", 1358642622}, + {"tvm.stackEntryTuple", -157391908}, + {"tvm.stackEntryList", -1186714229}, {"tvm.stackEntryUnsupported", 378880498}, - {"uninited.accountState", -918880075}, - {"wallet.accountState", -1919815977}, - {"wallet.initialAccountState", -1079249978}, - {"wallet.v3.accountState", 1977698154}, - {"wallet.v3.initialAccountState", 283460879} + {"tvm.tuple", -1363953053} }; auto it = m.find(str); if (it == m.end()) { @@ -186,30 +290,35 @@ Result tl_constructor_from_string(tonlib_api::Function *object, const std {"changeLocalPassword", -401590337}, {"close", -1187782273}, {"createNewKey", -1861385712}, + {"createQuery", -1316835098}, {"decrypt", 357991854}, {"deleteAllKeys", 1608776483}, {"deleteKey", -1579595571}, + {"dns.resolve", -149238065}, {"encrypt", -1821422820}, {"exportEncryptedKey", 218237311}, {"exportKey", -1622353549}, {"exportPemKey", -643259462}, - {"generic.createSendGramsQuery", 208206338}, - {"generic.getAccountState", -657000446}, - {"generic.sendGrams", -553513162}, + {"exportUnencryptedKey", -634665152}, + {"getAccountAddress", -1159101819}, + {"getAccountState", -2116357050}, {"getBip39Hints", -1889640982}, {"getLogStream", 1167608667}, {"getLogTagVerbosityLevel", 951004547}, {"getLogTags", -254449190}, {"getLogVerbosityLevel", 594057956}, + {"guessAccountRevision", 1463344293}, {"importEncryptedKey", 656724958}, {"importKey", -1607900903}, {"importPemKey", 76385617}, - {"init", -2014661877}, + {"importUnencryptedKey", -1184671467}, + {"init", -1000594762}, {"kdf", -1667861635}, {"liteServer.getInfo", 1435327470}, + {"msg.decrypt", 1131086633}, {"onLiteServerQueryError", -677427533}, {"onLiteServerQueryResult", 2056444510}, - {"options.setConfig", 646497241}, + {"options.setConfig", 1870064579}, {"options.validateConfig", -346965447}, {"packAccountAddress", -1388561940}, {"query.estimateFees", -957002175}, @@ -218,9 +327,8 @@ Result tl_constructor_from_string(tonlib_api::Function *object, const std {"query.send", 925242739}, {"raw.createAndSendMessage", -772224603}, {"raw.createQuery", -1928557909}, - {"raw.getAccountAddress", -521283849}, - {"raw.getAccountState", 663706721}, - {"raw.getTransactions", 935377269}, + {"raw.getAccountState", -1327847118}, + {"raw.getTransactions", 1029612317}, {"raw.sendMessage", -1789427488}, {"runTests", -2039925427}, {"setLogStream", -1364199535}, @@ -231,20 +339,9 @@ Result tl_constructor_from_string(tonlib_api::Function *object, const std {"smc.getState", -214390293}, {"smc.load", -903491521}, {"smc.runGetMethod", -255261270}, - {"sync", -1617065525}, - {"testGiver.getAccountAddress", -540100768}, - {"testGiver.getAccountState", 267738275}, - {"testGiver.sendGrams", -1785750375}, - {"testWallet.getAccountAddress", -1557748223}, - {"testWallet.getAccountState", 654082364}, - {"testWallet.init", -1417409140}, - {"testWallet.sendGrams", 573748322}, + {"sync", -1875977070}, {"unpackAccountAddress", -682459063}, - {"wallet.getAccountAddress", -1004103180}, - {"wallet.getAccountState", 462294850}, - {"wallet.init", -395706309}, - {"wallet.sendGrams", 297317621}, - {"wallet.v3.getAccountAddress", 1011655671} + {"withBlock", -789093723} }; auto it = m.find(str); if (it == m.end()) { @@ -261,6 +358,156 @@ Status from_json(tonlib_api::accountAddress &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::accountRevisionList &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "revisions", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.revisions_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "code", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.code_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.data_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.frozen_hash_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_highload_v1_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_highload_v2_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::dns_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.frozen_hash_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::actionNoop &to, JsonObject &from) { + return Status::OK(); +} +Status from_json(tonlib_api::actionMsg &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "messages", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.messages_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "allow_send_to_uninited", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.allow_send_to_uninited_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::actionDns &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "actions", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.actions_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::adnlAddress &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "adnl_address", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.adnl_address_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::bip39Hints &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "words", JsonValue::Type::Null, true)); @@ -348,6 +595,15 @@ Status from_json(tonlib_api::exportedPemKey &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::exportedUnencryptedKey &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.data_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::fees &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "in_fwd_fee", JsonValue::Type::Null, true)); @@ -375,6 +631,135 @@ Status from_json(tonlib_api::fees &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::fullAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.balance_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.last_transaction_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "block_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.block_id_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.sync_utime_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.account_state_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "code", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.code_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.data_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::testGiver_initialAccountState &to, JsonObject &from) { + return Status::OK(); +} +Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.public_key_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.public_key_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.public_key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_highload_v1_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.public_key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::wallet_highload_v2_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.public_key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::dns_initialAccountState &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.public_key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.wallet_id_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::inputKeyRegular &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "key", JsonValue::Type::Null, true)); @@ -477,21 +862,6 @@ Status from_json(tonlib_api::options &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::sendGramsResult &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "sent_until", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.sent_until_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "body_hash", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.body_hash_, value)); - } - } - return Status::OK(); -} Status from_json(tonlib_api::syncStateDone &to, JsonObject &from) { return Status::OK(); } @@ -567,56 +937,125 @@ Status from_json(tonlib_api::updateSyncState &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::generic_accountStateRaw &to, JsonObject &from) { +Status from_json(tonlib_api::dns_actionDeleteAll &to, JsonObject &from) { + return Status::OK(); +} +Status from_json(tonlib_api::dns_actionDelete &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_state_, value)); + TRY_STATUS(from_json(to.name_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "category", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.category_, value)); } } return Status::OK(); } -Status from_json(tonlib_api::generic_accountStateTestWallet &to, JsonObject &from) { +Status from_json(tonlib_api::dns_actionSet &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "entry", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_state_, value)); + TRY_STATUS(from_json(to.entry_, value)); } } return Status::OK(); } -Status from_json(tonlib_api::generic_accountStateWallet &to, JsonObject &from) { +Status from_json(tonlib_api::dns_entry &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_state_, value)); + TRY_STATUS(from_json(to.name_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "category", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.category_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "entry", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.entry_, value)); } } return Status::OK(); } -Status from_json(tonlib_api::generic_accountStateWalletV3 &to, JsonObject &from) { +Status from_json(tonlib_api::dns_entryDataUnknown &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "bytes", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_state_, value)); + TRY_STATUS(from_json_bytes(to.bytes_, value)); } } return Status::OK(); } -Status from_json(tonlib_api::generic_accountStateTestGiver &to, JsonObject &from) { +Status from_json(tonlib_api::dns_entryDataText &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_state_, value)); + TRY_STATUS(from_json(to.text_, value)); } } return Status::OK(); } -Status from_json(tonlib_api::generic_accountStateUninited &to, JsonObject &from) { +Status from_json(tonlib_api::dns_entryDataNextResolver &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "resolver", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_state_, value)); + TRY_STATUS(from_json(to.resolver_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::dns_entryDataSmcAddress &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "smc_address", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.smc_address_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::dns_entryDataAdnlAddress &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "adnl_address", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.adnl_address_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::dns_resolved &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "entries", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.entries_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::ton_blockId &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.workchain_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "shard", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.shard_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.seqno_, value)); } } return Status::OK(); @@ -657,6 +1096,72 @@ Status from_json(tonlib_api::liteServer_info &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::msg_dataRaw &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "body", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.body_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::msg_dataText &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.text_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::msg_dataDecryptedText &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.text_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::msg_dataEncryptedText &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "text", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.text_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::msg_dataArray &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "elements", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.elements_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::msg_message &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.destination_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.amount_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.data_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::options_configInfo &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "default_wallet_id", JsonValue::Type::Null, true)); @@ -666,6 +1171,15 @@ Status from_json(tonlib_api::options_configInfo &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::options_info &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "config_info", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.config_info_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::query_fees &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "source_fees", JsonValue::Type::Null, true)); @@ -702,7 +1216,7 @@ Status from_json(tonlib_api::query_info &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) { +Status from_json(tonlib_api::raw_fullAccountState &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { @@ -727,6 +1241,12 @@ Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) { TRY_STATUS(from_json(to.last_transaction_id_, value)); } } + { + TRY_RESULT(value, get_json_object_field(from, "block_id", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.block_id_, value)); + } + } { TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { @@ -741,21 +1261,6 @@ Status from_json(tonlib_api::raw_accountState &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "code", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.code_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.data_, value)); - } - } - return Status::OK(); -} Status from_json(tonlib_api::raw_message &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "source", JsonValue::Type::Null, true)); @@ -800,9 +1305,9 @@ Status from_json(tonlib_api::raw_message &to, JsonObject &from) { } } { - TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "msg_data", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.message_, value)); + TRY_STATUS(from_json(to.msg_data_, value)); } } return Status::OK(); @@ -921,11 +1426,17 @@ Status from_json(tonlib_api::smc_runResult &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from) { +Status from_json(tonlib_api::ton_blockIdExt &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "workchain", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.balance_, value)); + TRY_STATUS(from_json(to.workchain_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "shard", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.shard_, value)); } } { @@ -935,51 +1446,15 @@ Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from) { } } { - TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "root_hash", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.last_transaction_id_, value)); + TRY_STATUS(from_json_bytes(to.root_hash_, value)); } } { - TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "file_hash", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.sync_utime_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.balance_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.seqno_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.last_transaction_id_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.sync_utime_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.public_key_, value)); + TRY_STATUS(from_json_bytes(to.file_hash_, value)); } } return Status::OK(); @@ -988,7 +1463,16 @@ Status from_json(tonlib_api::tvm_cell &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "bytes", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.bytes_, value)); + TRY_STATUS(from_json_bytes(to.bytes_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::tvm_list &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "elements", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.elements_, value)); } } return Status::OK(); @@ -1006,7 +1490,7 @@ Status from_json(tonlib_api::tvm_slice &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "bytes", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.bytes_, value)); + TRY_STATUS(from_json_bytes(to.bytes_, value)); } } return Status::OK(); @@ -1038,116 +1522,32 @@ Status from_json(tonlib_api::tvm_stackEntryNumber &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::tvm_stackEntryTuple &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "tuple", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.tuple_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::tvm_stackEntryList &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "list", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.list_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::tvm_stackEntryUnsupported &to, JsonObject &from) { return Status::OK(); } -Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from) { +Status from_json(tonlib_api::tvm_tuple &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "elements", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.balance_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.last_transaction_id_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "frozen_hash", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.frozen_hash_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.sync_utime_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.balance_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.seqno_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.last_transaction_id_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.sync_utime_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.public_key_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "balance", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.balance_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.wallet_id_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.seqno_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "last_transaction_id", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.last_transaction_id_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "sync_utime", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.sync_utime_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "public_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.public_key_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "wallet_id", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.wallet_id_, value)); + TRY_STATUS(from_json(to.elements_, value)); } } return Status::OK(); @@ -1206,6 +1606,33 @@ Status from_json(tonlib_api::createNewKey &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::createQuery &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.private_key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "address", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.address_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "timeout", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.timeout_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "action", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.action_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::decrypt &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "encrypted_data", JsonValue::Type::Null, true)); @@ -1233,6 +1660,33 @@ Status from_json(tonlib_api::deleteKey &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::dns_resolve &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.account_address_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "name", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.name_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "category", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.category_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "ttl", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.ttl_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::encrypt &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "decrypted_data", JsonValue::Type::Null, true)); @@ -1287,52 +1741,31 @@ Status from_json(tonlib_api::exportPemKey &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::generic_createSendGramsQuery &to, JsonObject &from) { +Status from_json(tonlib_api::exportUnencryptedKey &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "input_key", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.private_key_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "source", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.source_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.destination_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.amount_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "timeout", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.timeout_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "allow_send_to_uninited", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.allow_send_to_uninited_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.message_, value)); + TRY_STATUS(from_json(to.input_key_, value)); } } return Status::OK(); } -Status from_json(tonlib_api::generic_getAccountState &to, JsonObject &from) { +Status from_json(tonlib_api::getAccountAddress &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "initial_account_state", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.initial_account_state_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "revision", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.revision_, value)); + } + } + return Status::OK(); +} +Status from_json(tonlib_api::getAccountState &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { @@ -1341,51 +1774,6 @@ Status from_json(tonlib_api::generic_getAccountState &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::generic_sendGrams &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.private_key_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "source", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.source_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.destination_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.amount_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "timeout", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.timeout_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "allow_send_to_uninited", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.allow_send_to_uninited_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.message_, value)); - } - } - return Status::OK(); -} Status from_json(tonlib_api::getBip39Hints &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "prefix", JsonValue::Type::Null, true)); @@ -1413,6 +1801,15 @@ Status from_json(tonlib_api::getLogTags &to, JsonObject &from) { Status from_json(tonlib_api::getLogVerbosityLevel &to, JsonObject &from) { return Status::OK(); } +Status from_json(tonlib_api::guessAccountRevision &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "initial_account_state", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.initial_account_state_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::importEncryptedKey &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "local_password", JsonValue::Type::Null, true)); @@ -1476,6 +1873,21 @@ Status from_json(tonlib_api::importPemKey &to, JsonObject &from) { } return Status::OK(); } +Status from_json(tonlib_api::importUnencryptedKey &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "local_password", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json_bytes(to.local_password_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "exported_unencrypted_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.exported_unencrypted_key_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::init &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "options", JsonValue::Type::Null, true)); @@ -1509,6 +1921,21 @@ Status from_json(tonlib_api::kdf &to, JsonObject &from) { Status from_json(tonlib_api::liteServer_getInfo &to, JsonObject &from) { return Status::OK(); } +Status from_json(tonlib_api::msg_decrypt &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "input_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.input_key_, value)); + } + } + { + TRY_RESULT(value, get_json_object_field(from, "data", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.data_, value)); + } + } + return Status::OK(); +} Status from_json(tonlib_api::onLiteServerQueryError &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true)); @@ -1656,15 +2083,6 @@ Status from_json(tonlib_api::raw_createQuery &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::raw_getAccountAddress &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.initital_account_state_, value)); - } - } - return Status::OK(); -} Status from_json(tonlib_api::raw_getAccountState &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); @@ -1675,6 +2093,12 @@ Status from_json(tonlib_api::raw_getAccountState &to, JsonObject &from) { return Status::OK(); } Status from_json(tonlib_api::raw_getTransactions &to, JsonObject &from) { + { + TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); + if (value.type() != JsonValue::Type::Null) { + TRY_STATUS(from_json(to.private_key_, value)); + } + } { TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { @@ -1800,99 +2224,6 @@ Status from_json(tonlib_api::smc_runGetMethod &to, JsonObject &from) { Status from_json(tonlib_api::sync &to, JsonObject &from) { return Status::OK(); } -Status from_json(tonlib_api::testGiver_getAccountAddress &to, JsonObject &from) { - return Status::OK(); -} -Status from_json(tonlib_api::testGiver_getAccountState &to, JsonObject &from) { - return Status::OK(); -} -Status from_json(tonlib_api::testGiver_sendGrams &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.destination_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.seqno_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.amount_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.message_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::testWallet_getAccountAddress &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.initital_account_state_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::testWallet_getAccountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_address_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::testWallet_init &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.private_key_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::testWallet_sendGrams &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.private_key_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.destination_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.seqno_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.amount_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.message_, value)); - } - } - return Status::OK(); -} Status from_json(tonlib_api::unpackAccountAddress &to, JsonObject &from) { { TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); @@ -1902,77 +2233,17 @@ Status from_json(tonlib_api::unpackAccountAddress &to, JsonObject &from) { } return Status::OK(); } -Status from_json(tonlib_api::wallet_getAccountAddress &to, JsonObject &from) { +Status from_json(tonlib_api::withBlock &to, JsonObject &from) { { - TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "id", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.initital_account_state_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_getAccountState &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "account_address", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.account_address_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_init &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.private_key_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_sendGrams &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "private_key", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.private_key_, value)); + TRY_STATUS(from_json(to.id_, value)); } } { - TRY_RESULT(value, get_json_object_field(from, "destination", JsonValue::Type::Null, true)); + TRY_RESULT(value, get_json_object_field(from, "function", JsonValue::Type::Null, true)); if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.destination_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "seqno", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.seqno_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "valid_until", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.valid_until_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "amount", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.amount_, value)); - } - } - { - TRY_RESULT(value, get_json_object_field(from, "message", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json_bytes(to.message_, value)); - } - } - return Status::OK(); -} -Status from_json(tonlib_api::wallet_v3_getAccountAddress &to, JsonObject &from) { - { - TRY_RESULT(value, get_json_object_field(from, "initital_account_state", JsonValue::Type::Null, true)); - if (value.type() != JsonValue::Type::Null) { - TRY_STATUS(from_json(to.initital_account_state_, value)); + TRY_STATUS(from_json(to.function_, value)); } } return Status::OK(); @@ -1982,6 +2253,86 @@ void to_json(JsonValueScope &jv, const tonlib_api::accountAddress &object) { jo << ctie("@type", "accountAddress"); jo << ctie("account_address", ToJson(object.account_address_)); } +void to_json(JsonValueScope &jv, const tonlib_api::accountRevisionList &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "accountRevisionList"); + jo << ctie("revisions", ToJson(object.revisions_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::AccountState &object) { + tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "raw.accountState"); + jo << ctie("code", ToJson(JsonBytes{object.code_})); + jo << ctie("data", ToJson(JsonBytes{object.data_})); + jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "testWallet.accountState"); + jo << ctie("seqno", ToJson(object.seqno_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.accountState"); + jo << ctie("seqno", ToJson(object.seqno_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.v3.accountState"); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); + jo << ctie("seqno", ToJson(object.seqno_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.highload.v1.accountState"); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); + jo << ctie("seqno", ToJson(object.seqno_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.highload.v2.accountState"); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "testGiver.accountState"); + jo << ctie("seqno", ToJson(object.seqno_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.accountState"); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "uninited.accountState"); + jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::Action &object) { + tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const tonlib_api::actionNoop &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "actionNoop"); +} +void to_json(JsonValueScope &jv, const tonlib_api::actionMsg &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "actionMsg"); + jo << ctie("messages", ToJson(object.messages_)); + jo << ctie("allow_send_to_uninited", ToJson(object.allow_send_to_uninited_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::actionDns &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "actionDns"); + jo << ctie("actions", ToJson(object.actions_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::adnlAddress &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "adnlAddress"); + jo << ctie("adnl_address", ToJson(object.adnl_address_)); +} void to_json(JsonValueScope &jv, const tonlib_api::bip39Hints &object) { auto jo = jv.enter_object(); jo << ctie("@type", "bip39Hints"); @@ -2021,6 +2372,11 @@ void to_json(JsonValueScope &jv, const tonlib_api::exportedPemKey &object) { jo << ctie("@type", "exportedPemKey"); jo << ctie("pem", ToJson(object.pem_)); } +void to_json(JsonValueScope &jv, const tonlib_api::exportedUnencryptedKey &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "exportedUnencryptedKey"); + jo << ctie("data", ToJson(JsonBytes{object.data_})); +} void to_json(JsonValueScope &jv, const tonlib_api::fees &object) { auto jo = jv.enter_object(); jo << ctie("@type", "fees"); @@ -2029,6 +2385,68 @@ void to_json(JsonValueScope &jv, const tonlib_api::fees &object) { jo << ctie("gas_fee", ToJson(object.gas_fee_)); jo << ctie("fwd_fee", ToJson(object.fwd_fee_)); } +void to_json(JsonValueScope &jv, const tonlib_api::fullAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "fullAccountState"); + jo << ctie("balance", ToJson(JsonInt64{object.balance_})); + if (object.last_transaction_id_) { + jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); + } + if (object.block_id_) { + jo << ctie("block_id", ToJson(object.block_id_)); + } + jo << ctie("sync_utime", ToJson(object.sync_utime_)); + if (object.account_state_) { + jo << ctie("account_state", ToJson(object.account_state_)); + } +} +void to_json(JsonValueScope &jv, const tonlib_api::InitialAccountState &object) { + tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "raw.initialAccountState"); + jo << ctie("code", ToJson(JsonBytes{object.code_})); + jo << ctie("data", ToJson(JsonBytes{object.data_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::testGiver_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "testGiver.initialAccountState"); +} +void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "testWallet.initialAccountState"); + jo << ctie("public_key", ToJson(object.public_key_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.initialAccountState"); + jo << ctie("public_key", ToJson(object.public_key_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.v3.initialAccountState"); + jo << ctie("public_key", ToJson(object.public_key_)); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.highload.v1.initialAccountState"); + jo << ctie("public_key", ToJson(object.public_key_)); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "wallet.highload.v2.initialAccountState"); + jo << ctie("public_key", ToJson(object.public_key_)); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_initialAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.initialAccountState"); + jo << ctie("public_key", ToJson(object.public_key_)); + jo << ctie("wallet_id", ToJson(JsonInt64{object.wallet_id_})); +} void to_json(JsonValueScope &jv, const tonlib_api::InputKey &object) { tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); } @@ -2103,12 +2521,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::options &object) { jo << ctie("keystore_type", ToJson(object.keystore_type_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::sendGramsResult &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "sendGramsResult"); - jo << ctie("sent_until", ToJson(object.sent_until_)); - jo << ctie("body_hash", ToJson(JsonBytes{object.body_hash_})); -} void to_json(JsonValueScope &jv, const tonlib_api::SyncState &object) { tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); } @@ -2147,50 +2559,80 @@ void to_json(JsonValueScope &jv, const tonlib_api::updateSyncState &object) { jo << ctie("sync_state", ToJson(object.sync_state_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_AccountState &object) { - tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +void to_json(JsonValueScope &jv, const tonlib_api::dns_Action &object) { + tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); } -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateRaw &object) { +void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDeleteAll &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.accountStateRaw"); - if (object.account_state_) { - jo << ctie("account_state", ToJson(object.account_state_)); + jo << ctie("@type", "dns.actionDeleteAll"); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDelete &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.actionDelete"); + jo << ctie("name", ToJson(object.name_)); + jo << ctie("category", ToJson(object.category_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_actionSet &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.actionSet"); + if (object.entry_) { + jo << ctie("entry", ToJson(object.entry_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestWallet &object) { +void to_json(JsonValueScope &jv, const tonlib_api::dns_entry &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.accountStateTestWallet"); - if (object.account_state_) { - jo << ctie("account_state", ToJson(object.account_state_)); + jo << ctie("@type", "dns.entry"); + jo << ctie("name", ToJson(object.name_)); + jo << ctie("category", ToJson(object.category_)); + if (object.entry_) { + jo << ctie("entry", ToJson(object.entry_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWallet &object) { +void to_json(JsonValueScope &jv, const tonlib_api::dns_EntryData &object) { + tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataUnknown &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.accountStateWallet"); - if (object.account_state_) { - jo << ctie("account_state", ToJson(object.account_state_)); + jo << ctie("@type", "dns.entryDataUnknown"); + jo << ctie("bytes", ToJson(JsonBytes{object.bytes_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataText &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.entryDataText"); + jo << ctie("text", ToJson(object.text_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataNextResolver &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.entryDataNextResolver"); + if (object.resolver_) { + jo << ctie("resolver", ToJson(object.resolver_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWalletV3 &object) { +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataSmcAddress &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.accountStateWalletV3"); - if (object.account_state_) { - jo << ctie("account_state", ToJson(object.account_state_)); + jo << ctie("@type", "dns.entryDataSmcAddress"); + if (object.smc_address_) { + jo << ctie("smc_address", ToJson(object.smc_address_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestGiver &object) { +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataAdnlAddress &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.accountStateTestGiver"); - if (object.account_state_) { - jo << ctie("account_state", ToJson(object.account_state_)); + jo << ctie("@type", "dns.entryDataAdnlAddress"); + if (object.adnl_address_) { + jo << ctie("adnl_address", ToJson(object.adnl_address_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateUninited &object) { +void to_json(JsonValueScope &jv, const tonlib_api::dns_resolved &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.accountStateUninited"); - if (object.account_state_) { - jo << ctie("account_state", ToJson(object.account_state_)); - } + jo << ctie("@type", "dns.resolved"); + jo << ctie("entries", ToJson(object.entries_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::ton_blockId &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "ton.blockId"); + jo << ctie("workchain", ToJson(object.workchain_)); + jo << ctie("shard", ToJson(JsonInt64{object.shard_})); + jo << ctie("seqno", ToJson(object.seqno_)); } void to_json(JsonValueScope &jv, const tonlib_api::internal_transactionId &object) { auto jo = jv.enter_object(); @@ -2205,10 +2647,56 @@ void to_json(JsonValueScope &jv, const tonlib_api::liteServer_info &object) { jo << ctie("version", ToJson(object.version_)); jo << ctie("capabilities", ToJson(JsonInt64{object.capabilities_})); } +void to_json(JsonValueScope &jv, const tonlib_api::msg_Data &object) { + tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); +} +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataRaw &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.dataRaw"); + jo << ctie("body", ToJson(JsonBytes{object.body_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataText &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.dataText"); + jo << ctie("text", ToJson(JsonBytes{object.text_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataDecryptedText &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.dataDecryptedText"); + jo << ctie("text", ToJson(JsonBytes{object.text_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataEncryptedText &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.dataEncryptedText"); + jo << ctie("text", ToJson(JsonBytes{object.text_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataArray &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.dataArray"); + jo << ctie("elements", ToJson(object.elements_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::msg_message &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.message"); + if (object.destination_) { + jo << ctie("destination", ToJson(object.destination_)); + } + jo << ctie("amount", ToJson(JsonInt64{object.amount_})); + if (object.data_) { + jo << ctie("data", ToJson(object.data_)); + } +} void to_json(JsonValueScope &jv, const tonlib_api::options_configInfo &object) { auto jo = jv.enter_object(); jo << ctie("@type", "options.configInfo"); - jo << ctie("default_wallet_id", ToJson(object.default_wallet_id_)); + jo << ctie("default_wallet_id", ToJson(JsonInt64{object.default_wallet_id_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::options_info &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "options.info"); + if (object.config_info_) { + jo << ctie("config_info", ToJson(object.config_info_)); + } } void to_json(JsonValueScope &jv, const tonlib_api::query_fees &object) { auto jo = jv.enter_object(); @@ -2216,9 +2704,7 @@ void to_json(JsonValueScope &jv, const tonlib_api::query_fees &object) { if (object.source_fees_) { jo << ctie("source_fees", ToJson(object.source_fees_)); } - if (object.destination_fees_) { - jo << ctie("destination_fees", ToJson(object.destination_fees_)); - } + jo << ctie("destination_fees", ToJson(object.destination_fees_)); } void to_json(JsonValueScope &jv, const tonlib_api::query_info &object) { auto jo = jv.enter_object(); @@ -2227,24 +2713,21 @@ void to_json(JsonValueScope &jv, const tonlib_api::query_info &object) { jo << ctie("valid_until", ToJson(object.valid_until_)); jo << ctie("body_hash", ToJson(JsonBytes{object.body_hash_})); } -void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object) { +void to_json(JsonValueScope &jv, const tonlib_api::raw_fullAccountState &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "raw.accountState"); + jo << ctie("@type", "raw.fullAccountState"); jo << ctie("balance", ToJson(JsonInt64{object.balance_})); jo << ctie("code", ToJson(JsonBytes{object.code_})); jo << ctie("data", ToJson(JsonBytes{object.data_})); if (object.last_transaction_id_) { jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); } + if (object.block_id_) { + jo << ctie("block_id", ToJson(object.block_id_)); + } jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_})); jo << ctie("sync_utime", ToJson(object.sync_utime_)); } -void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "raw.initialAccountState"); - jo << ctie("code", ToJson(JsonBytes{object.code_})); - jo << ctie("data", ToJson(JsonBytes{object.data_})); -} void to_json(JsonValueScope &jv, const tonlib_api::raw_message &object) { auto jo = jv.enter_object(); jo << ctie("@type", "raw.message"); @@ -2255,7 +2738,9 @@ void to_json(JsonValueScope &jv, const tonlib_api::raw_message &object) { jo << ctie("ihr_fee", ToJson(JsonInt64{object.ihr_fee_})); jo << ctie("created_lt", ToJson(JsonInt64{object.created_lt_})); jo << ctie("body_hash", ToJson(JsonBytes{object.body_hash_})); - jo << ctie("message", ToJson(JsonBytes{object.message_})); + if (object.msg_data_) { + jo << ctie("msg_data", ToJson(object.msg_data_)); + } } void to_json(JsonValueScope &jv, const tonlib_api::raw_transaction &object) { auto jo = jv.enter_object(); @@ -2306,35 +2791,24 @@ void to_json(JsonValueScope &jv, const tonlib_api::smc_runResult &object) { jo << ctie("stack", ToJson(object.stack_)); jo << ctie("exit_code", ToJson(object.exit_code_)); } -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object) { +void to_json(JsonValueScope &jv, const tonlib_api::ton_blockIdExt &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "testGiver.accountState"); - jo << ctie("balance", ToJson(JsonInt64{object.balance_})); + jo << ctie("@type", "ton.blockIdExt"); + jo << ctie("workchain", ToJson(object.workchain_)); + jo << ctie("shard", ToJson(JsonInt64{object.shard_})); jo << ctie("seqno", ToJson(object.seqno_)); - if (object.last_transaction_id_) { - jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); - } - jo << ctie("sync_utime", ToJson(object.sync_utime_)); -} -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testWallet.accountState"); - jo << ctie("balance", ToJson(JsonInt64{object.balance_})); - jo << ctie("seqno", ToJson(object.seqno_)); - if (object.last_transaction_id_) { - jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); - } - jo << ctie("sync_utime", ToJson(object.sync_utime_)); -} -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testWallet.initialAccountState"); - jo << ctie("public_key", ToJson(object.public_key_)); + jo << ctie("root_hash", ToJson(JsonBytes{object.root_hash_})); + jo << ctie("file_hash", ToJson(JsonBytes{object.file_hash_})); } void to_json(JsonValueScope &jv, const tonlib_api::tvm_cell &object) { auto jo = jv.enter_object(); jo << ctie("@type", "tvm.cell"); - jo << ctie("bytes", ToJson(object.bytes_)); + jo << ctie("bytes", ToJson(JsonBytes{object.bytes_})); +} +void to_json(JsonValueScope &jv, const tonlib_api::tvm_list &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tvm.list"); + jo << ctie("elements", ToJson(object.elements_)); } void to_json(JsonValueScope &jv, const tonlib_api::tvm_numberDecimal &object) { auto jo = jv.enter_object(); @@ -2344,7 +2818,7 @@ void to_json(JsonValueScope &jv, const tonlib_api::tvm_numberDecimal &object) { void to_json(JsonValueScope &jv, const tonlib_api::tvm_slice &object) { auto jo = jv.enter_object(); jo << ctie("@type", "tvm.slice"); - jo << ctie("bytes", ToJson(object.bytes_)); + jo << ctie("bytes", ToJson(JsonBytes{object.bytes_})); } void to_json(JsonValueScope &jv, const tonlib_api::tvm_StackEntry &object) { tonlib_api::downcast_call(const_cast(object), [&jv](const auto &object) { to_json(jv, object); }); @@ -2370,51 +2844,28 @@ void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryNumber &object) jo << ctie("number", ToJson(object.number_)); } } +void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryTuple &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tvm.stackEntryTuple"); + if (object.tuple_) { + jo << ctie("tuple", ToJson(object.tuple_)); + } +} +void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryList &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "tvm.stackEntryList"); + if (object.list_) { + jo << ctie("list", ToJson(object.list_)); + } +} void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryUnsupported &object) { auto jo = jv.enter_object(); jo << ctie("@type", "tvm.stackEntryUnsupported"); } -void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object) { +void to_json(JsonValueScope &jv, const tonlib_api::tvm_tuple &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "uninited.accountState"); - jo << ctie("balance", ToJson(JsonInt64{object.balance_})); - if (object.last_transaction_id_) { - jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); - } - jo << ctie("frozen_hash", ToJson(JsonBytes{object.frozen_hash_})); - jo << ctie("sync_utime", ToJson(object.sync_utime_)); -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.accountState"); - jo << ctie("balance", ToJson(JsonInt64{object.balance_})); - jo << ctie("seqno", ToJson(object.seqno_)); - if (object.last_transaction_id_) { - jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); - } - jo << ctie("sync_utime", ToJson(object.sync_utime_)); -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.initialAccountState"); - jo << ctie("public_key", ToJson(object.public_key_)); -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.v3.accountState"); - jo << ctie("balance", ToJson(JsonInt64{object.balance_})); - jo << ctie("wallet_id", ToJson(object.wallet_id_)); - jo << ctie("seqno", ToJson(object.seqno_)); - if (object.last_transaction_id_) { - jo << ctie("last_transaction_id", ToJson(object.last_transaction_id_)); - } - jo << ctie("sync_utime", ToJson(object.sync_utime_)); -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.v3.initialAccountState"); - jo << ctie("public_key", ToJson(object.public_key_)); - jo << ctie("wallet_id", ToJson(object.wallet_id_)); + jo << ctie("@type", "tvm.tuple"); + jo << ctie("elements", ToJson(object.elements_)); } void to_json(JsonValueScope &jv, const tonlib_api::addLogMessage &object) { auto jo = jv.enter_object(); @@ -2441,6 +2892,20 @@ void to_json(JsonValueScope &jv, const tonlib_api::createNewKey &object) { jo << ctie("mnemonic_password", ToJson(JsonBytes{object.mnemonic_password_})); jo << ctie("random_extra_seed", ToJson(JsonBytes{object.random_extra_seed_})); } +void to_json(JsonValueScope &jv, const tonlib_api::createQuery &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "createQuery"); + if (object.private_key_) { + jo << ctie("private_key", ToJson(object.private_key_)); + } + if (object.address_) { + jo << ctie("address", ToJson(object.address_)); + } + jo << ctie("timeout", ToJson(object.timeout_)); + if (object.action_) { + jo << ctie("action", ToJson(object.action_)); + } +} void to_json(JsonValueScope &jv, const tonlib_api::decrypt &object) { auto jo = jv.enter_object(); jo << ctie("@type", "decrypt"); @@ -2458,6 +2923,16 @@ void to_json(JsonValueScope &jv, const tonlib_api::deleteKey &object) { jo << ctie("key", ToJson(object.key_)); } } +void to_json(JsonValueScope &jv, const tonlib_api::dns_resolve &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "dns.resolve"); + if (object.account_address_) { + jo << ctie("account_address", ToJson(object.account_address_)); + } + jo << ctie("name", ToJson(object.name_)); + jo << ctie("category", ToJson(object.category_)); + jo << ctie("ttl", ToJson(object.ttl_)); +} void to_json(JsonValueScope &jv, const tonlib_api::encrypt &object) { auto jo = jv.enter_object(); jo << ctie("@type", "encrypt"); @@ -2487,47 +2962,28 @@ void to_json(JsonValueScope &jv, const tonlib_api::exportPemKey &object) { } jo << ctie("key_password", ToJson(JsonBytes{object.key_password_})); } -void to_json(JsonValueScope &jv, const tonlib_api::generic_createSendGramsQuery &object) { +void to_json(JsonValueScope &jv, const tonlib_api::exportUnencryptedKey &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.createSendGramsQuery"); - if (object.private_key_) { - jo << ctie("private_key", ToJson(object.private_key_)); + jo << ctie("@type", "exportUnencryptedKey"); + if (object.input_key_) { + jo << ctie("input_key", ToJson(object.input_key_)); } - if (object.source_) { - jo << ctie("source", ToJson(object.source_)); - } - if (object.destination_) { - jo << ctie("destination", ToJson(object.destination_)); - } - jo << ctie("amount", ToJson(JsonInt64{object.amount_})); - jo << ctie("timeout", ToJson(object.timeout_)); - jo << ctie("allow_send_to_uninited", ToJson(object.allow_send_to_uninited_)); - jo << ctie("message", ToJson(JsonBytes{object.message_})); } -void to_json(JsonValueScope &jv, const tonlib_api::generic_getAccountState &object) { +void to_json(JsonValueScope &jv, const tonlib_api::getAccountAddress &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "generic.getAccountState"); + jo << ctie("@type", "getAccountAddress"); + if (object.initial_account_state_) { + jo << ctie("initial_account_state", ToJson(object.initial_account_state_)); + } + jo << ctie("revision", ToJson(object.revision_)); +} +void to_json(JsonValueScope &jv, const tonlib_api::getAccountState &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "getAccountState"); if (object.account_address_) { jo << ctie("account_address", ToJson(object.account_address_)); } } -void to_json(JsonValueScope &jv, const tonlib_api::generic_sendGrams &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "generic.sendGrams"); - if (object.private_key_) { - jo << ctie("private_key", ToJson(object.private_key_)); - } - if (object.source_) { - jo << ctie("source", ToJson(object.source_)); - } - if (object.destination_) { - jo << ctie("destination", ToJson(object.destination_)); - } - jo << ctie("amount", ToJson(JsonInt64{object.amount_})); - jo << ctie("timeout", ToJson(object.timeout_)); - jo << ctie("allow_send_to_uninited", ToJson(object.allow_send_to_uninited_)); - jo << ctie("message", ToJson(JsonBytes{object.message_})); -} void to_json(JsonValueScope &jv, const tonlib_api::getBip39Hints &object) { auto jo = jv.enter_object(); jo << ctie("@type", "getBip39Hints"); @@ -2550,6 +3006,13 @@ void to_json(JsonValueScope &jv, const tonlib_api::getLogVerbosityLevel &object) auto jo = jv.enter_object(); jo << ctie("@type", "getLogVerbosityLevel"); } +void to_json(JsonValueScope &jv, const tonlib_api::guessAccountRevision &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "guessAccountRevision"); + if (object.initial_account_state_) { + jo << ctie("initial_account_state", ToJson(object.initial_account_state_)); + } +} void to_json(JsonValueScope &jv, const tonlib_api::importEncryptedKey &object) { auto jo = jv.enter_object(); jo << ctie("@type", "importEncryptedKey"); @@ -2577,6 +3040,14 @@ void to_json(JsonValueScope &jv, const tonlib_api::importPemKey &object) { jo << ctie("exported_key", ToJson(object.exported_key_)); } } +void to_json(JsonValueScope &jv, const tonlib_api::importUnencryptedKey &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "importUnencryptedKey"); + jo << ctie("local_password", ToJson(JsonBytes{object.local_password_})); + if (object.exported_unencrypted_key_) { + jo << ctie("exported_unencrypted_key", ToJson(object.exported_unencrypted_key_)); + } +} void to_json(JsonValueScope &jv, const tonlib_api::init &object) { auto jo = jv.enter_object(); jo << ctie("@type", "init"); @@ -2595,6 +3066,16 @@ void to_json(JsonValueScope &jv, const tonlib_api::liteServer_getInfo &object) { auto jo = jv.enter_object(); jo << ctie("@type", "liteServer.getInfo"); } +void to_json(JsonValueScope &jv, const tonlib_api::msg_decrypt &object) { + auto jo = jv.enter_object(); + jo << ctie("@type", "msg.decrypt"); + if (object.input_key_) { + jo << ctie("input_key", ToJson(object.input_key_)); + } + if (object.data_) { + jo << ctie("data", ToJson(object.data_)); + } +} void to_json(JsonValueScope &jv, const tonlib_api::onLiteServerQueryError &object) { auto jo = jv.enter_object(); jo << ctie("@type", "onLiteServerQueryError"); @@ -2670,13 +3151,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::raw_createQuery &object) { jo << ctie("init_data", ToJson(JsonBytes{object.init_data_})); jo << ctie("body", ToJson(JsonBytes{object.body_})); } -void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountAddress &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "raw.getAccountAddress"); - if (object.initital_account_state_) { - jo << ctie("initital_account_state", ToJson(object.initital_account_state_)); - } -} void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountState &object) { auto jo = jv.enter_object(); jo << ctie("@type", "raw.getAccountState"); @@ -2687,6 +3161,9 @@ void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountState &object) void to_json(JsonValueScope &jv, const tonlib_api::raw_getTransactions &object) { auto jo = jv.enter_object(); jo << ctie("@type", "raw.getTransactions"); + if (object.private_key_) { + jo << ctie("private_key", ToJson(object.private_key_)); + } if (object.account_address_) { jo << ctie("account_address", ToJson(object.account_address_)); } @@ -2757,104 +3234,18 @@ void to_json(JsonValueScope &jv, const tonlib_api::sync &object) { auto jo = jv.enter_object(); jo << ctie("@type", "sync"); } -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountAddress &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testGiver.getAccountAddress"); -} -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testGiver.getAccountState"); -} -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_sendGrams &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testGiver.sendGrams"); - if (object.destination_) { - jo << ctie("destination", ToJson(object.destination_)); - } - jo << ctie("seqno", ToJson(object.seqno_)); - jo << ctie("amount", ToJson(JsonInt64{object.amount_})); - jo << ctie("message", ToJson(JsonBytes{object.message_})); -} -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountAddress &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testWallet.getAccountAddress"); - if (object.initital_account_state_) { - jo << ctie("initital_account_state", ToJson(object.initital_account_state_)); - } -} -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testWallet.getAccountState"); - if (object.account_address_) { - jo << ctie("account_address", ToJson(object.account_address_)); - } -} -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_init &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testWallet.init"); - if (object.private_key_) { - jo << ctie("private_key", ToJson(object.private_key_)); - } -} -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_sendGrams &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "testWallet.sendGrams"); - if (object.private_key_) { - jo << ctie("private_key", ToJson(object.private_key_)); - } - if (object.destination_) { - jo << ctie("destination", ToJson(object.destination_)); - } - jo << ctie("seqno", ToJson(object.seqno_)); - jo << ctie("amount", ToJson(JsonInt64{object.amount_})); - jo << ctie("message", ToJson(JsonBytes{object.message_})); -} void to_json(JsonValueScope &jv, const tonlib_api::unpackAccountAddress &object) { auto jo = jv.enter_object(); jo << ctie("@type", "unpackAccountAddress"); jo << ctie("account_address", ToJson(object.account_address_)); } -void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountAddress &object) { +void to_json(JsonValueScope &jv, const tonlib_api::withBlock &object) { auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.getAccountAddress"); - if (object.initital_account_state_) { - jo << ctie("initital_account_state", ToJson(object.initital_account_state_)); - } -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountState &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.getAccountState"); - if (object.account_address_) { - jo << ctie("account_address", ToJson(object.account_address_)); - } -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_init &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.init"); - if (object.private_key_) { - jo << ctie("private_key", ToJson(object.private_key_)); - } -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_sendGrams &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.sendGrams"); - if (object.private_key_) { - jo << ctie("private_key", ToJson(object.private_key_)); - } - if (object.destination_) { - jo << ctie("destination", ToJson(object.destination_)); - } - jo << ctie("seqno", ToJson(object.seqno_)); - jo << ctie("valid_until", ToJson(object.valid_until_)); - jo << ctie("amount", ToJson(JsonInt64{object.amount_})); - jo << ctie("message", ToJson(JsonBytes{object.message_})); -} -void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_getAccountAddress &object) { - auto jo = jv.enter_object(); - jo << ctie("@type", "wallet.v3.getAccountAddress"); - if (object.initital_account_state_) { - jo << ctie("initital_account_state", ToJson(object.initital_account_state_)); + jo << ctie("@type", "withBlock"); + if (object.id_) { + jo << ctie("id", ToJson(object.id_)); } + jo << ctie("function", ToJson(object.function_)); } } // namespace tonlib_api } // namespace ton diff --git a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h index d57816d82e..4c1c430fc7 100644 --- a/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h +++ b/submodules/ton/tonlib-src/tl/generate/auto/tl/tonlib_api_json.h @@ -11,17 +11,36 @@ namespace ton { namespace tonlib_api{ using namespace td; +Result tl_constructor_from_string(tonlib_api::AccountState *object, const std::string &str); +Result tl_constructor_from_string(tonlib_api::Action *object, const std::string &str); +Result tl_constructor_from_string(tonlib_api::InitialAccountState *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::InputKey *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::KeyStoreType *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::LogStream *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::SyncState *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::Update *object, const std::string &str); -Result tl_constructor_from_string(tonlib_api::generic_AccountState *object, const std::string &str); +Result tl_constructor_from_string(tonlib_api::dns_Action *object, const std::string &str); +Result tl_constructor_from_string(tonlib_api::dns_EntryData *object, const std::string &str); +Result tl_constructor_from_string(tonlib_api::msg_Data *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::smc_MethodId *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::tvm_StackEntry *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::Object *object, const std::string &str); Result tl_constructor_from_string(tonlib_api::Function *object, const std::string &str); Status from_json(tonlib_api::accountAddress &to, JsonObject &from); +Status from_json(tonlib_api::accountRevisionList &to, JsonObject &from); +Status from_json(tonlib_api::raw_accountState &to, JsonObject &from); +Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_highload_v1_accountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_highload_v2_accountState &to, JsonObject &from); +Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from); +Status from_json(tonlib_api::dns_accountState &to, JsonObject &from); +Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from); +Status from_json(tonlib_api::actionNoop &to, JsonObject &from); +Status from_json(tonlib_api::actionMsg &to, JsonObject &from); +Status from_json(tonlib_api::actionDns &to, JsonObject &from); +Status from_json(tonlib_api::adnlAddress &to, JsonObject &from); Status from_json(tonlib_api::bip39Hints &to, JsonObject &from); Status from_json(tonlib_api::config &to, JsonObject &from); Status from_json(tonlib_api::data &to, JsonObject &from); @@ -29,7 +48,17 @@ Status from_json(tonlib_api::error &to, JsonObject &from); Status from_json(tonlib_api::exportedEncryptedKey &to, JsonObject &from); Status from_json(tonlib_api::exportedKey &to, JsonObject &from); Status from_json(tonlib_api::exportedPemKey &to, JsonObject &from); +Status from_json(tonlib_api::exportedUnencryptedKey &to, JsonObject &from); Status from_json(tonlib_api::fees &to, JsonObject &from); +Status from_json(tonlib_api::fullAccountState &to, JsonObject &from); +Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::testGiver_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_highload_v1_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::wallet_highload_v2_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::dns_initialAccountState &to, JsonObject &from); Status from_json(tonlib_api::inputKeyRegular &to, JsonObject &from); Status from_json(tonlib_api::inputKeyFake &to, JsonObject &from); Status from_json(tonlib_api::key &to, JsonObject &from); @@ -42,25 +71,35 @@ Status from_json(tonlib_api::logTags &to, JsonObject &from); Status from_json(tonlib_api::logVerbosityLevel &to, JsonObject &from); Status from_json(tonlib_api::ok &to, JsonObject &from); Status from_json(tonlib_api::options &to, JsonObject &from); -Status from_json(tonlib_api::sendGramsResult &to, JsonObject &from); Status from_json(tonlib_api::syncStateDone &to, JsonObject &from); Status from_json(tonlib_api::syncStateInProgress &to, JsonObject &from); Status from_json(tonlib_api::unpackedAccountAddress &to, JsonObject &from); Status from_json(tonlib_api::updateSendLiteServerQuery &to, JsonObject &from); Status from_json(tonlib_api::updateSyncState &to, JsonObject &from); -Status from_json(tonlib_api::generic_accountStateRaw &to, JsonObject &from); -Status from_json(tonlib_api::generic_accountStateTestWallet &to, JsonObject &from); -Status from_json(tonlib_api::generic_accountStateWallet &to, JsonObject &from); -Status from_json(tonlib_api::generic_accountStateWalletV3 &to, JsonObject &from); -Status from_json(tonlib_api::generic_accountStateTestGiver &to, JsonObject &from); -Status from_json(tonlib_api::generic_accountStateUninited &to, JsonObject &from); +Status from_json(tonlib_api::dns_actionDeleteAll &to, JsonObject &from); +Status from_json(tonlib_api::dns_actionDelete &to, JsonObject &from); +Status from_json(tonlib_api::dns_actionSet &to, JsonObject &from); +Status from_json(tonlib_api::dns_entry &to, JsonObject &from); +Status from_json(tonlib_api::dns_entryDataUnknown &to, JsonObject &from); +Status from_json(tonlib_api::dns_entryDataText &to, JsonObject &from); +Status from_json(tonlib_api::dns_entryDataNextResolver &to, JsonObject &from); +Status from_json(tonlib_api::dns_entryDataSmcAddress &to, JsonObject &from); +Status from_json(tonlib_api::dns_entryDataAdnlAddress &to, JsonObject &from); +Status from_json(tonlib_api::dns_resolved &to, JsonObject &from); +Status from_json(tonlib_api::ton_blockId &to, JsonObject &from); Status from_json(tonlib_api::internal_transactionId &to, JsonObject &from); Status from_json(tonlib_api::liteServer_info &to, JsonObject &from); +Status from_json(tonlib_api::msg_dataRaw &to, JsonObject &from); +Status from_json(tonlib_api::msg_dataText &to, JsonObject &from); +Status from_json(tonlib_api::msg_dataDecryptedText &to, JsonObject &from); +Status from_json(tonlib_api::msg_dataEncryptedText &to, JsonObject &from); +Status from_json(tonlib_api::msg_dataArray &to, JsonObject &from); +Status from_json(tonlib_api::msg_message &to, JsonObject &from); Status from_json(tonlib_api::options_configInfo &to, JsonObject &from); +Status from_json(tonlib_api::options_info &to, JsonObject &from); Status from_json(tonlib_api::query_fees &to, JsonObject &from); Status from_json(tonlib_api::query_info &to, JsonObject &from); -Status from_json(tonlib_api::raw_accountState &to, JsonObject &from); -Status from_json(tonlib_api::raw_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::raw_fullAccountState &to, JsonObject &from); Status from_json(tonlib_api::raw_message &to, JsonObject &from); Status from_json(tonlib_api::raw_transaction &to, JsonObject &from); Status from_json(tonlib_api::raw_transactions &to, JsonObject &from); @@ -68,46 +107,48 @@ Status from_json(tonlib_api::smc_info &to, JsonObject &from); Status from_json(tonlib_api::smc_methodIdNumber &to, JsonObject &from); Status from_json(tonlib_api::smc_methodIdName &to, JsonObject &from); Status from_json(tonlib_api::smc_runResult &to, JsonObject &from); -Status from_json(tonlib_api::testGiver_accountState &to, JsonObject &from); -Status from_json(tonlib_api::testWallet_accountState &to, JsonObject &from); -Status from_json(tonlib_api::testWallet_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::ton_blockIdExt &to, JsonObject &from); Status from_json(tonlib_api::tvm_cell &to, JsonObject &from); +Status from_json(tonlib_api::tvm_list &to, JsonObject &from); Status from_json(tonlib_api::tvm_numberDecimal &to, JsonObject &from); Status from_json(tonlib_api::tvm_slice &to, JsonObject &from); Status from_json(tonlib_api::tvm_stackEntrySlice &to, JsonObject &from); Status from_json(tonlib_api::tvm_stackEntryCell &to, JsonObject &from); Status from_json(tonlib_api::tvm_stackEntryNumber &to, JsonObject &from); +Status from_json(tonlib_api::tvm_stackEntryTuple &to, JsonObject &from); +Status from_json(tonlib_api::tvm_stackEntryList &to, JsonObject &from); Status from_json(tonlib_api::tvm_stackEntryUnsupported &to, JsonObject &from); -Status from_json(tonlib_api::uninited_accountState &to, JsonObject &from); -Status from_json(tonlib_api::wallet_accountState &to, JsonObject &from); -Status from_json(tonlib_api::wallet_initialAccountState &to, JsonObject &from); -Status from_json(tonlib_api::wallet_v3_accountState &to, JsonObject &from); -Status from_json(tonlib_api::wallet_v3_initialAccountState &to, JsonObject &from); +Status from_json(tonlib_api::tvm_tuple &to, JsonObject &from); Status from_json(tonlib_api::addLogMessage &to, JsonObject &from); Status from_json(tonlib_api::changeLocalPassword &to, JsonObject &from); Status from_json(tonlib_api::close &to, JsonObject &from); Status from_json(tonlib_api::createNewKey &to, JsonObject &from); +Status from_json(tonlib_api::createQuery &to, JsonObject &from); Status from_json(tonlib_api::decrypt &to, JsonObject &from); Status from_json(tonlib_api::deleteAllKeys &to, JsonObject &from); Status from_json(tonlib_api::deleteKey &to, JsonObject &from); +Status from_json(tonlib_api::dns_resolve &to, JsonObject &from); Status from_json(tonlib_api::encrypt &to, JsonObject &from); Status from_json(tonlib_api::exportEncryptedKey &to, JsonObject &from); Status from_json(tonlib_api::exportKey &to, JsonObject &from); Status from_json(tonlib_api::exportPemKey &to, JsonObject &from); -Status from_json(tonlib_api::generic_createSendGramsQuery &to, JsonObject &from); -Status from_json(tonlib_api::generic_getAccountState &to, JsonObject &from); -Status from_json(tonlib_api::generic_sendGrams &to, JsonObject &from); +Status from_json(tonlib_api::exportUnencryptedKey &to, JsonObject &from); +Status from_json(tonlib_api::getAccountAddress &to, JsonObject &from); +Status from_json(tonlib_api::getAccountState &to, JsonObject &from); Status from_json(tonlib_api::getBip39Hints &to, JsonObject &from); Status from_json(tonlib_api::getLogStream &to, JsonObject &from); Status from_json(tonlib_api::getLogTagVerbosityLevel &to, JsonObject &from); Status from_json(tonlib_api::getLogTags &to, JsonObject &from); Status from_json(tonlib_api::getLogVerbosityLevel &to, JsonObject &from); +Status from_json(tonlib_api::guessAccountRevision &to, JsonObject &from); Status from_json(tonlib_api::importEncryptedKey &to, JsonObject &from); Status from_json(tonlib_api::importKey &to, JsonObject &from); Status from_json(tonlib_api::importPemKey &to, JsonObject &from); +Status from_json(tonlib_api::importUnencryptedKey &to, JsonObject &from); Status from_json(tonlib_api::init &to, JsonObject &from); Status from_json(tonlib_api::kdf &to, JsonObject &from); Status from_json(tonlib_api::liteServer_getInfo &to, JsonObject &from); +Status from_json(tonlib_api::msg_decrypt &to, JsonObject &from); Status from_json(tonlib_api::onLiteServerQueryError &to, JsonObject &from); Status from_json(tonlib_api::onLiteServerQueryResult &to, JsonObject &from); Status from_json(tonlib_api::options_setConfig &to, JsonObject &from); @@ -119,7 +160,6 @@ Status from_json(tonlib_api::query_getInfo &to, JsonObject &from); Status from_json(tonlib_api::query_send &to, JsonObject &from); Status from_json(tonlib_api::raw_createAndSendMessage &to, JsonObject &from); Status from_json(tonlib_api::raw_createQuery &to, JsonObject &from); -Status from_json(tonlib_api::raw_getAccountAddress &to, JsonObject &from); Status from_json(tonlib_api::raw_getAccountState &to, JsonObject &from); Status from_json(tonlib_api::raw_getTransactions &to, JsonObject &from); Status from_json(tonlib_api::raw_sendMessage &to, JsonObject &from); @@ -133,20 +173,25 @@ Status from_json(tonlib_api::smc_getState &to, JsonObject &from); Status from_json(tonlib_api::smc_load &to, JsonObject &from); Status from_json(tonlib_api::smc_runGetMethod &to, JsonObject &from); Status from_json(tonlib_api::sync &to, JsonObject &from); -Status from_json(tonlib_api::testGiver_getAccountAddress &to, JsonObject &from); -Status from_json(tonlib_api::testGiver_getAccountState &to, JsonObject &from); -Status from_json(tonlib_api::testGiver_sendGrams &to, JsonObject &from); -Status from_json(tonlib_api::testWallet_getAccountAddress &to, JsonObject &from); -Status from_json(tonlib_api::testWallet_getAccountState &to, JsonObject &from); -Status from_json(tonlib_api::testWallet_init &to, JsonObject &from); -Status from_json(tonlib_api::testWallet_sendGrams &to, JsonObject &from); Status from_json(tonlib_api::unpackAccountAddress &to, JsonObject &from); -Status from_json(tonlib_api::wallet_getAccountAddress &to, JsonObject &from); -Status from_json(tonlib_api::wallet_getAccountState &to, JsonObject &from); -Status from_json(tonlib_api::wallet_init &to, JsonObject &from); -Status from_json(tonlib_api::wallet_sendGrams &to, JsonObject &from); -Status from_json(tonlib_api::wallet_v3_getAccountAddress &to, JsonObject &from); +Status from_json(tonlib_api::withBlock &to, JsonObject &from); void to_json(JsonValueScope &jv, const tonlib_api::accountAddress &object); +void to_json(JsonValueScope &jv, const tonlib_api::accountRevisionList &object); +void to_json(JsonValueScope &jv, const tonlib_api::AccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::Action &object); +void to_json(JsonValueScope &jv, const tonlib_api::actionNoop &object); +void to_json(JsonValueScope &jv, const tonlib_api::actionMsg &object); +void to_json(JsonValueScope &jv, const tonlib_api::actionDns &object); +void to_json(JsonValueScope &jv, const tonlib_api::adnlAddress &object); void to_json(JsonValueScope &jv, const tonlib_api::bip39Hints &object); void to_json(JsonValueScope &jv, const tonlib_api::config &object); void to_json(JsonValueScope &jv, const tonlib_api::data &object); @@ -154,7 +199,18 @@ void to_json(JsonValueScope &jv, const tonlib_api::error &object); void to_json(JsonValueScope &jv, const tonlib_api::exportedEncryptedKey &object); void to_json(JsonValueScope &jv, const tonlib_api::exportedKey &object); void to_json(JsonValueScope &jv, const tonlib_api::exportedPemKey &object); +void to_json(JsonValueScope &jv, const tonlib_api::exportedUnencryptedKey &object); void to_json(JsonValueScope &jv, const tonlib_api::fees &object); +void to_json(JsonValueScope &jv, const tonlib_api::fullAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::InitialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::testGiver_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v1_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::wallet_highload_v2_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_initialAccountState &object); void to_json(JsonValueScope &jv, const tonlib_api::InputKey &object); void to_json(JsonValueScope &jv, const tonlib_api::inputKeyRegular &object); void to_json(JsonValueScope &jv, const tonlib_api::inputKeyFake &object); @@ -170,7 +226,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::logTags &object); void to_json(JsonValueScope &jv, const tonlib_api::logVerbosityLevel &object); void to_json(JsonValueScope &jv, const tonlib_api::ok &object); void to_json(JsonValueScope &jv, const tonlib_api::options &object); -void to_json(JsonValueScope &jv, const tonlib_api::sendGramsResult &object); void to_json(JsonValueScope &jv, const tonlib_api::SyncState &object); void to_json(JsonValueScope &jv, const tonlib_api::syncStateDone &object); void to_json(JsonValueScope &jv, const tonlib_api::syncStateInProgress &object); @@ -178,20 +233,33 @@ void to_json(JsonValueScope &jv, const tonlib_api::unpackedAccountAddress &objec void to_json(JsonValueScope &jv, const tonlib_api::Update &object); void to_json(JsonValueScope &jv, const tonlib_api::updateSendLiteServerQuery &object); void to_json(JsonValueScope &jv, const tonlib_api::updateSyncState &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_AccountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateRaw &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestWallet &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWallet &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateWalletV3 &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateTestGiver &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_accountStateUninited &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_Action &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDeleteAll &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_actionDelete &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_actionSet &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_entry &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_EntryData &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataUnknown &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataText &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataNextResolver &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataSmcAddress &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_entryDataAdnlAddress &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_resolved &object); +void to_json(JsonValueScope &jv, const tonlib_api::ton_blockId &object); void to_json(JsonValueScope &jv, const tonlib_api::internal_transactionId &object); void to_json(JsonValueScope &jv, const tonlib_api::liteServer_info &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_Data &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataRaw &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataText &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataDecryptedText &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataEncryptedText &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_dataArray &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_message &object); void to_json(JsonValueScope &jv, const tonlib_api::options_configInfo &object); +void to_json(JsonValueScope &jv, const tonlib_api::options_info &object); void to_json(JsonValueScope &jv, const tonlib_api::query_fees &object); void to_json(JsonValueScope &jv, const tonlib_api::query_info &object); -void to_json(JsonValueScope &jv, const tonlib_api::raw_accountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::raw_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::raw_fullAccountState &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_message &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_transaction &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_transactions &object); @@ -200,47 +268,49 @@ void to_json(JsonValueScope &jv, const tonlib_api::smc_MethodId &object); void to_json(JsonValueScope &jv, const tonlib_api::smc_methodIdNumber &object); void to_json(JsonValueScope &jv, const tonlib_api::smc_methodIdName &object); void to_json(JsonValueScope &jv, const tonlib_api::smc_runResult &object); -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_accountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_accountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::ton_blockIdExt &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_cell &object); +void to_json(JsonValueScope &jv, const tonlib_api::tvm_list &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_numberDecimal &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_slice &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_StackEntry &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntrySlice &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryCell &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryNumber &object); +void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryTuple &object); +void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryList &object); void to_json(JsonValueScope &jv, const tonlib_api::tvm_stackEntryUnsupported &object); -void to_json(JsonValueScope &jv, const tonlib_api::uninited_accountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_accountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_initialAccountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_accountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_initialAccountState &object); +void to_json(JsonValueScope &jv, const tonlib_api::tvm_tuple &object); void to_json(JsonValueScope &jv, const tonlib_api::addLogMessage &object); void to_json(JsonValueScope &jv, const tonlib_api::changeLocalPassword &object); void to_json(JsonValueScope &jv, const tonlib_api::close &object); void to_json(JsonValueScope &jv, const tonlib_api::createNewKey &object); +void to_json(JsonValueScope &jv, const tonlib_api::createQuery &object); void to_json(JsonValueScope &jv, const tonlib_api::decrypt &object); void to_json(JsonValueScope &jv, const tonlib_api::deleteAllKeys &object); void to_json(JsonValueScope &jv, const tonlib_api::deleteKey &object); +void to_json(JsonValueScope &jv, const tonlib_api::dns_resolve &object); void to_json(JsonValueScope &jv, const tonlib_api::encrypt &object); void to_json(JsonValueScope &jv, const tonlib_api::exportEncryptedKey &object); void to_json(JsonValueScope &jv, const tonlib_api::exportKey &object); void to_json(JsonValueScope &jv, const tonlib_api::exportPemKey &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_createSendGramsQuery &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_getAccountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::generic_sendGrams &object); +void to_json(JsonValueScope &jv, const tonlib_api::exportUnencryptedKey &object); +void to_json(JsonValueScope &jv, const tonlib_api::getAccountAddress &object); +void to_json(JsonValueScope &jv, const tonlib_api::getAccountState &object); void to_json(JsonValueScope &jv, const tonlib_api::getBip39Hints &object); void to_json(JsonValueScope &jv, const tonlib_api::getLogStream &object); void to_json(JsonValueScope &jv, const tonlib_api::getLogTagVerbosityLevel &object); void to_json(JsonValueScope &jv, const tonlib_api::getLogTags &object); void to_json(JsonValueScope &jv, const tonlib_api::getLogVerbosityLevel &object); +void to_json(JsonValueScope &jv, const tonlib_api::guessAccountRevision &object); void to_json(JsonValueScope &jv, const tonlib_api::importEncryptedKey &object); void to_json(JsonValueScope &jv, const tonlib_api::importKey &object); void to_json(JsonValueScope &jv, const tonlib_api::importPemKey &object); +void to_json(JsonValueScope &jv, const tonlib_api::importUnencryptedKey &object); void to_json(JsonValueScope &jv, const tonlib_api::init &object); void to_json(JsonValueScope &jv, const tonlib_api::kdf &object); void to_json(JsonValueScope &jv, const tonlib_api::liteServer_getInfo &object); +void to_json(JsonValueScope &jv, const tonlib_api::msg_decrypt &object); void to_json(JsonValueScope &jv, const tonlib_api::onLiteServerQueryError &object); void to_json(JsonValueScope &jv, const tonlib_api::onLiteServerQueryResult &object); void to_json(JsonValueScope &jv, const tonlib_api::options_setConfig &object); @@ -252,7 +322,6 @@ void to_json(JsonValueScope &jv, const tonlib_api::query_getInfo &object); void to_json(JsonValueScope &jv, const tonlib_api::query_send &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_createAndSendMessage &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_createQuery &object); -void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountAddress &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_getAccountState &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_getTransactions &object); void to_json(JsonValueScope &jv, const tonlib_api::raw_sendMessage &object); @@ -266,19 +335,8 @@ void to_json(JsonValueScope &jv, const tonlib_api::smc_getState &object); void to_json(JsonValueScope &jv, const tonlib_api::smc_load &object); void to_json(JsonValueScope &jv, const tonlib_api::smc_runGetMethod &object); void to_json(JsonValueScope &jv, const tonlib_api::sync &object); -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountAddress &object); -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_getAccountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::testGiver_sendGrams &object); -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountAddress &object); -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_getAccountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_init &object); -void to_json(JsonValueScope &jv, const tonlib_api::testWallet_sendGrams &object); void to_json(JsonValueScope &jv, const tonlib_api::unpackAccountAddress &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountAddress &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_getAccountState &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_init &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_sendGrams &object); -void to_json(JsonValueScope &jv, const tonlib_api::wallet_v3_getAccountAddress &object); +void to_json(JsonValueScope &jv, const tonlib_api::withBlock &object); inline void to_json(JsonValueScope &jv, const ton::tonlib_api::Object &object) { ton::tonlib_api::downcast_call(const_cast(object),[&jv](const auto &object) { to_json(jv, object); }); } diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/.tonlib_api.tl.swp b/submodules/ton/tonlib-src/tl/generate/scheme/.tonlib_api.tl.swp deleted file mode 100644 index 47e8571856..0000000000 Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/.tonlib_api.tl.swp and /dev/null differ diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl index 9604624a74..7d4495e72c 100644 --- a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl +++ b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tl @@ -35,6 +35,7 @@ liteServer.blockState id:tonNode.blockIdExt root_hash:int256 file_hash:int256 da liteServer.blockHeader id:tonNode.blockIdExt mode:# header_proof:bytes = liteServer.BlockHeader; liteServer.sendMsgStatus status:int = liteServer.SendMsgStatus; liteServer.accountState id:tonNode.blockIdExt shardblk:tonNode.blockIdExt shard_proof:bytes proof:bytes state:bytes = liteServer.AccountState; +liteServer.runMethodResult mode:# id:tonNode.blockIdExt shardblk:tonNode.blockIdExt shard_proof:mode.0?bytes proof:mode.0?bytes state_proof:mode.1?bytes init_c7:mode.3?bytes lib_extras:mode.4?bytes exit_code:int result:mode.2?bytes = liteServer.RunMethodResult; liteServer.shardInfo id:tonNode.blockIdExt shardblk:tonNode.blockIdExt shard_proof:bytes shard_descr:bytes = liteServer.ShardInfo; liteServer.allShardsInfo id:tonNode.blockIdExt proof:bytes data:bytes = liteServer.AllShardsInfo; liteServer.transactionInfo id:tonNode.blockIdExt proof:bytes transaction:bytes = liteServer.TransactionInfo; @@ -48,6 +49,7 @@ liteServer.blockLinkBack to_key_block:Bool from:tonNode.blockIdExt to:tonNode.bl liteServer.blockLinkForward to_key_block:Bool from:tonNode.blockIdExt to:tonNode.blockIdExt dest_proof:bytes config_proof:bytes signatures:liteServer.SignatureSet = liteServer.BlockLink; liteServer.partialBlockProof complete:Bool from:tonNode.blockIdExt to:tonNode.blockIdExt steps:(vector liteServer.BlockLink) = liteServer.PartialBlockProof; liteServer.configInfo mode:# id:tonNode.blockIdExt state_proof:bytes config_proof:bytes = liteServer.ConfigInfo; +liteServer.validatorStats mode:# id:tonNode.blockIdExt count:int complete:Bool state_proof:bytes data_proof:bytes = liteServer.ValidatorStats; liteServer.debug.verbosity value:int = liteServer.debug.Verbosity; @@ -62,6 +64,7 @@ liteServer.getState id:tonNode.blockIdExt = liteServer.BlockState; liteServer.getBlockHeader id:tonNode.blockIdExt mode:# = liteServer.BlockHeader; liteServer.sendMessage body:bytes = liteServer.SendMsgStatus; liteServer.getAccountState id:tonNode.blockIdExt account:liteServer.accountId = liteServer.AccountState; +liteServer.runSmcMethod mode:# id:tonNode.blockIdExt account:liteServer.accountId method_id:long params:bytes = liteServer.RunMethodResult; liteServer.getShardInfo id:tonNode.blockIdExt workchain:int shard:long exact:Bool = liteServer.ShardInfo; liteServer.getAllShardsInfo id:tonNode.blockIdExt = liteServer.AllShardsInfo; liteServer.getOneTransaction id:tonNode.blockIdExt account:liteServer.accountId lt:long = liteServer.TransactionInfo; @@ -71,6 +74,7 @@ liteServer.listBlockTransactions id:tonNode.blockIdExt mode:# count:# after:mode liteServer.getBlockProof mode:# known_block:tonNode.blockIdExt target_block:mode.0?tonNode.blockIdExt = liteServer.PartialBlockProof; liteServer.getConfigAll mode:# id:tonNode.blockIdExt = liteServer.ConfigInfo; liteServer.getConfigParams mode:# id:tonNode.blockIdExt param_list:(vector int) = liteServer.ConfigInfo; +liteServer.getValidatorStats#091a58bc mode:# id:tonNode.blockIdExt limit:int start_after:mode.0?int256 modified_after:mode.2?int = liteServer.ValidatorStats; liteServer.queryPrefix = Object; liteServer.query data:bytes = Object; diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo index 9b01c0d881..d524f54b71 100644 Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo and b/submodules/ton/tonlib-src/tl/generate/scheme/lite_api.tlo differ diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/storage_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/storage_api.tl new file mode 100644 index 0000000000..e69de29bb2 diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/tmp.tl b/submodules/ton/tonlib-src/tl/generate/scheme/tmp.tl new file mode 100644 index 0000000000..bc7a831cc3 --- /dev/null +++ b/submodules/ton/tonlib-src/tl/generate/scheme/tmp.tl @@ -0,0 +1,16 @@ + +// +// Multisig wallet +// + +// multisig.unsignedOrder wallet_id:int64 valid_until:int53 order_id:int53 message:msg.message = multisig.UnsignedOrder; +// multisig.signature owner_id:int32 signature:bytes = multisig.Signature; +// multisig.order order:multisig.unsignedOrder signatures:vector = multisig.Order; +// multisig.orders = orders:vector = multisig.Orders; +// +// multisig.initialAccountState public_keys:vector wallet_id:int64 k:int32 = InitialAccountState; +// multisig.accountState public_keys:vector wallet_id:int64 k:int32 = AccountState; +// +// multisig.sign private_key:InputKey order:multisig.unsignedOrder = multisig.Signature; +// multisig.getPendingOrders account_address:accountAddress unsigned_by:int32 = multisig.Orders; + diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl index 7617f1fe09..1f819d5dd3 100644 --- a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl +++ b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tl @@ -362,6 +362,9 @@ tonNode.capabilities version:int capabilities:long = tonNode.Capabilities; tonNode.success = tonNode.Success; +tonNode.archiveNotFound = tonNode.ArchiveInfo; +tonNode.archiveInfo id:long = tonNode.ArchiveInfo; + ---functions--- tonNode.getNextBlockDescription prev_block:tonNode.blockIdExt = tonNode.BlockDescription; @@ -385,6 +388,8 @@ tonNode.downloadBlockProof block:tonNode.blockIdExt = tonNode.Data; tonNode.downloadBlockProofs blocks:(vector tonNode.blockIdExt) = tonNode.DataList; tonNode.downloadBlockProofLink block:tonNode.blockIdExt = tonNode.Data; tonNode.downloadBlockProofLinks blocks:(vector tonNode.blockIdExt) = tonNode.DataList; +tonNode.getArchiveInfo masterchain_seqno:int = tonNode.ArchiveInfo; +tonNode.getArchiveSlice archive_id:long offset:long max_size:int = tonNode.Data; tonNode.getCapabilities = tonNode.Capabilities; @@ -417,7 +422,8 @@ db.block.info#4ac6e727 id:tonNode.blockIdExt flags:# prev_left:flags.1?tonNode.b next_right:flags.4?tonNode.blockIdExt lt:flags.13?long ts:flags.14?int - state:flags.17?int256 = db.block.Info; + state:flags.17?int256 + masterchain_ref_seqno:flags.23?int = db.block.Info; db.block.packedInfo id:tonNode.blockIdExt unixtime:int offset:long = db.block.Info; db.block.archivedInfo id:tonNode.blockIdExt flags:# next:flags.0?tonNode.blockIdExt = db.block.Info; @@ -437,6 +443,7 @@ db.filedb.key.proof block_id:tonNode.blockIdExt = db.filedb.Key; db.filedb.key.proofLink block_id:tonNode.blockIdExt = db.filedb.Key; db.filedb.key.signatures block_id:tonNode.blockIdExt = db.filedb.Key; db.filedb.key.candidate id:db.candidate.id = db.filedb.Key; +db.filedb.key.blockInfo block_id:tonNode.blockIdExt = db.filedb.Key; db.filedb.value key:db.filedb.Key prev:int256 next:int256 file_hash:int256 = db.filedb.Value; @@ -446,6 +453,7 @@ db.state.gcBlockId block:tonNode.blockIdExt = db.state.GcBlockId; db.state.shardClient block:tonNode.blockIdExt = db.state.ShardClient; db.state.asyncSerializer block:tonNode.blockIdExt last:tonNode.blockIdExt last_ts:int = db.state.AsyncSerializer; db.state.hardforks blocks:(vector tonNode.blockIdExt) = db.state.Hardforks; +db.state.dbVersion version:int = db.state.DbVersion; db.state.key.destroyedSessions = db.state.Key; db.state.key.initBlockId = db.state.Key; @@ -453,6 +461,7 @@ db.state.key.gcBlockId = db.state.Key; db.state.key.shardClient = db.state.Key; db.state.key.asyncSerializer = db.state.Key; db.state.key.hardforks = db.state.Key; +db.state.key.dbVersion = db.state.Key; db.lt.el.key workchain:int shard:long idx:int = db.lt.Key; db.lt.desc.key workchain:int shard:long = db.lt.Key; @@ -463,6 +472,14 @@ db.lt.desc.value first_idx:int last_idx:int last_seqno:int last_lt:long last_ts: db.lt.shard.value workchain:int shard:long = db.lt.shard.Value; db.lt.status.value total_shards:int = db.lt.status.Value; +db.files.index.key = db.files.Key; +db.files.package.key package_id:int key:Bool temp:Bool = db.files.Key; + +db.files.index.value packages:(vector int) key_packages:(vector int) temp_packages:(vector int) = db.files.index.Value; +db.files.package.firstBlock workchain:int shard:long seqno:int unixtime:int lt:long = db.files.package.FirstBlock; +db.files.package.value package_id:int key:Bool temp:Bool firstblocks:(vector db.files.package.firstBlock) deleted:Bool + = db.files.package.Value; + ---functions--- ---types--- @@ -597,3 +614,25 @@ engine.validator.createElectionBid election_date:int election_addr:string wallet engine.validator.checkDhtServers id:int256 = engine.validator.DhtServersStatus; engine.validator.controlQuery data:bytes = Object; + + +---types--- + +http.header name:string value:string = http.Header; +http.payloadPart data:bytes trailer:(vector http.header) last:Bool = http.PayloadPart; +http.response http_version:string status_code:int reason:string headers:(vector http.header) = http.Response; + +---functions--- + +http.request id:int256 method:string url:string http_version:string headers:(vector http.header) = http.Response; +http.getNextPayloadPart id:int256 seqno:int max_chunk_size:int = http.PayloadPart; + +---types--- + + +http.server.dnsEntry domain:string addr:adnl.id.short = http.server.DnsEntry; +http.server.host domains:(vector string) ip:int port:int adnl_id:adnl.id.short = http.server.Host; + +http.server.config dhs:(vector http.server.dnsEntry) local_hosts:(vector http.server.host) = http.server.Config; + +---functions--- diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo index 28e5cfa571..5507d156b0 100644 Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo and b/submodules/ton/tonlib-src/tl/generate/scheme/ton_api.tlo differ diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl index e6778df578..beb5d64a0c 100644 --- a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl +++ b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tl @@ -8,6 +8,9 @@ bytes = Bytes; secureString = SecureString; secureBytes = SecureBytes; +object ? = Object; +function ? = Function; + boolFalse = Bool; boolTrue = Bool; @@ -22,7 +25,8 @@ keyStoreTypeInMemory = KeyStoreType; config config:string blockchain_name:string use_callbacks_for_network:Bool ignore_cache:Bool = Config; options config:config keystore_type:KeyStoreType = Options; -options.configInfo default_wallet_id:int53 = options.ConfigInfo; +options.configInfo default_wallet_id:int64 = options.ConfigInfo; +options.info config_info:options.configInfo = options.Info; key public_key:string secret:secureBytes = Key; inputKeyRegular key:key local_password:secureBytes = InputKey; @@ -30,61 +34,108 @@ inputKeyFake = InputKey; exportedKey word_list:vector = ExportedKey; exportedPemKey pem:secureString = ExportedPemKey; exportedEncryptedKey data:secureBytes = ExportedEncryptedKey; +exportedUnencryptedKey data:secureBytes = ExportedUnencryptedKey; bip39Hints words:vector = Bip39Hints; +adnlAddress adnl_address:string = AdnlAddress; + accountAddress account_address:string = AccountAddress; +accountRevisionList revisions:vector = AccountRevisionList; unpackedAccountAddress workchain_id:int32 bounceable:Bool testnet:Bool addr:bytes = UnpackedAccountAddress; internal.transactionId lt:int64 hash:bytes = internal.TransactionId; -raw.initialAccountState code:bytes data:bytes = raw.InitialAccountState; -raw.accountState balance:int64 code:bytes data:bytes last_transaction_id:internal.transactionId frozen_hash:bytes sync_utime:int53 = raw.AccountState; -raw.message source:string destination:string value:int64 fwd_fee:int64 ihr_fee:int64 created_lt:int64 body_hash:bytes message:bytes = raw.Message; +ton.blockId workchain:int32 shard:int64 seqno:int32 = internal.BlockId; +ton.blockIdExt workchain:int32 shard:int64 seqno:int32 root_hash:bytes file_hash:bytes = ton.BlockIdExt; + +raw.fullAccountState balance:int64 code:bytes data:bytes last_transaction_id:internal.transactionId block_id:ton.blockIdExt frozen_hash:bytes sync_utime:int53 = raw.FullAccountState; +raw.message source:string destination:string value:int64 fwd_fee:int64 ihr_fee:int64 created_lt:int64 body_hash:bytes msg_data:msg.Data = raw.Message; raw.transaction utime:int53 data:bytes transaction_id:internal.transactionId fee:int64 storage_fee:int64 other_fee:int64 in_msg:raw.message out_msgs:vector = raw.Transaction; raw.transactions transactions:vector previous_transaction_id:internal.transactionId = raw.Transactions; -testWallet.initialAccountState public_key:string = testWallet.InitialAccountState; -testWallet.accountState balance:int64 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53 = testWallet.AccountState; +raw.initialAccountState code:bytes data:bytes = InitialAccountState; +testGiver.initialAccountState = InitialAccountState; +testWallet.initialAccountState public_key:string = InitialAccountState; +wallet.initialAccountState public_key:string = InitialAccountState; +wallet.v3.initialAccountState public_key:string wallet_id:int64 = InitialAccountState; +wallet.highload.v1.initialAccountState public_key:string wallet_id:int64 = InitialAccountState; +wallet.highload.v2.initialAccountState public_key:string wallet_id:int64 = InitialAccountState; +dns.initialAccountState public_key:string wallet_id:int64 = InitialAccountState; -wallet.initialAccountState public_key:string = wallet.InitialAccountState; -wallet.accountState balance:int64 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53 = wallet.AccountState; +raw.accountState code:bytes data:bytes frozen_hash:bytes = AccountState; +testWallet.accountState seqno:int32 = AccountState; +wallet.accountState seqno:int32 = AccountState; +wallet.v3.accountState wallet_id:int64 seqno:int32 = AccountState; +wallet.highload.v1.accountState wallet_id:int64 seqno:int32 = AccountState; +wallet.highload.v2.accountState wallet_id:int64 = AccountState; +testGiver.accountState seqno:int32 = AccountState; +dns.accountState wallet_id:int64 = AccountState; +uninited.accountState frozen_hash:bytes = AccountState; -wallet.v3.initialAccountState public_key:string wallet_id:int53 = wallet.v3.InitialAccountState; -wallet.v3.accountState balance:int64 wallet_id:int53 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53 = wallet.v3.AccountState; - -testGiver.accountState balance:int64 seqno:int32 last_transaction_id:internal.transactionId sync_utime:int53= testGiver.AccountState; - -uninited.accountState balance:int64 last_transaction_id:internal.transactionId frozen_hash:bytes sync_utime:int53 = uninited.AccountState; - -//generic.initialAccountStateRaw initital_account_state:raw.initialAccountState = generic.InitialAccountState; -//generic.initialAccountStateTestWallet initital_account_state:testWallet.initialAccountState = generic.InitialAccountState; -//generic.initialAccountStateWallet initital_account_state:wallet.initialAccountState = generic.InitialAccountState; - -generic.accountStateRaw account_state:raw.accountState = generic.AccountState; -generic.accountStateTestWallet account_state:testWallet.accountState = generic.AccountState; -generic.accountStateWallet account_state:wallet.accountState = generic.AccountState; -generic.accountStateWalletV3 account_state:wallet.v3.accountState = generic.AccountState; -generic.accountStateTestGiver account_state:testGiver.accountState = generic.AccountState; -generic.accountStateUninited account_state:uninited.accountState = generic.AccountState; - -sendGramsResult sent_until:int53 body_hash:bytes = SendGramsResult; +fullAccountState balance:int64 last_transaction_id:internal.transactionId block_id:ton.blockIdExt sync_utime:int53 account_state:AccountState = FullAccountState; syncStateDone = SyncState; syncStateInProgress from_seqno:int32 to_seqno:int32 current_seqno:int32 = SyncState; -fees in_fwd_fee:int53 storage_fee:int53 gas_fee:int53 fwd_fee:int53= Fees; -query.fees source_fees:fees destination_fees:fees = query.Fees; +// +// MSG +// + +msg.dataRaw body:bytes = msg.Data; +msg.dataText text:bytes = msg.Data; +msg.dataDecryptedText text:bytes = msg.Data; +msg.dataEncryptedText text:bytes = msg.Data; + +msg.dataArray elements:vector = msg.DataArray; + +msg.message destination:accountAddress amount:int64 data:msg.Data = msg.Message; + +// +// DNS +// + +dns.entryDataUnknown bytes:bytes = dns.EntryData; +dns.entryDataText text:string = dns.EntryData; +dns.entryDataNextResolver resolver:AccountAddress = dns.EntryData; +dns.entryDataSmcAddress smc_address:AccountAddress = dns.EntryData; +dns.entryDataAdnlAddress adnl_address:AdnlAddress = dns.EntryData; + +dns.entry name:string category:int32 entry:dns.EntryData = dns.Entry; + +dns.actionDeleteAll = dns.Action; +// use category = 0 to delete all entries +dns.actionDelete name:string category:int32 = dns.Action; +dns.actionSet entry:dns.entry = dns.Action; + +dns.resolved entries:vector = dns.Resolved; + +// +// Actions +// + +actionNoop = Action; +actionMsg messages:vector allow_send_to_uninited:Bool = Action; +actionDns actions:vector = Action; +//actionMultisig actions:vector = Action; + +fees in_fwd_fee:int53 storage_fee:int53 gas_fee:int53 fwd_fee:int53 = Fees; +query.fees source_fees:fees destination_fees:vector = query.Fees; +// query.emulationResult exit_code:int32 fees:fees = query.EmulationResult; query.info id:int53 valid_until:int53 body_hash:bytes = query.Info; -tvm.slice bytes:string = tvm.Slice; -tvm.cell bytes:string = tvm.Cell; +tvm.slice bytes:bytes = tvm.Slice; +tvm.cell bytes:bytes = tvm.Cell; tvm.numberDecimal number:string = tvm.Number; +tvm.tuple elements:vector = tvm.Tuple; +tvm.list elements:vector = tvm.List; tvm.stackEntrySlice slice:tvm.slice = tvm.StackEntry; tvm.stackEntryCell cell:tvm.cell = tvm.StackEntry; tvm.stackEntryNumber number:tvm.Number = tvm.StackEntry; +tvm.stackEntryTuple tuple:tvm.Tuple = tvm.StackEntry; +tvm.stackEntryList list:tvm.List = tvm.StackEntry; tvm.stackEntryUnsupported = tvm.StackEntry; smc.info id:int53 = smc.Info; @@ -121,10 +172,10 @@ liteServer.info now:int53 version:int32 capabilities:int64 = liteServer.Info; ---functions--- -init options:options = Ok; +init options:options = options.Info; close = Ok; -options.setConfig config:config = Ok; +options.setConfig config:config = options.ConfigInfo; options.validateConfig config:config = options.ConfigInfo; createNewKey local_password:secureBytes mnemonic_password:secureBytes random_extra_seed:secureBytes = Key; @@ -133,9 +184,11 @@ deleteAllKeys = Ok; exportKey input_key:InputKey = ExportedKey; exportPemKey input_key:InputKey key_password:secureBytes = ExportedPemKey; exportEncryptedKey input_key:InputKey key_password:secureBytes = ExportedEncryptedKey; +exportUnencryptedKey input_key:InputKey = ExportedUnencryptedKey; importKey local_password:secureBytes mnemonic_password:secureBytes exported_key:exportedKey = Key; importPemKey local_password:secureBytes key_password:secureBytes exported_key:exportedPemKey = Key; importEncryptedKey local_password:secureBytes key_password:secureBytes exported_encrypted_key:exportedEncryptedKey = Key; +importUnencryptedKey local_password:secureBytes exported_unencrypted_key:exportedUnencryptedKey = Key; changeLocalPassword input_key:InputKey new_local_password:secureBytes = Key; encrypt decrypted_data:secureBytes secret:secureBytes = Data; @@ -147,51 +200,44 @@ packAccountAddress account_address:unpackedAccountAddress = AccountAddress; getBip39Hints prefix:string = Bip39Hints; //raw.init initial_account_state:raw.initialAccountState = Ok; -raw.getAccountAddress initital_account_state:raw.initialAccountState = AccountAddress; -raw.getAccountState account_address:accountAddress = raw.AccountState; -raw.getTransactions account_address:accountAddress from_transaction_id:internal.transactionId = raw.Transactions; +raw.getAccountState account_address:accountAddress = raw.FullAccountState; +raw.getTransactions private_key:InputKey account_address:accountAddress from_transaction_id:internal.transactionId = raw.Transactions; raw.sendMessage body:bytes = Ok; raw.createAndSendMessage destination:accountAddress initial_account_state:bytes data:bytes = Ok; raw.createQuery destination:accountAddress init_code:bytes init_data:bytes body:bytes = query.Info; -testWallet.init private_key:InputKey = Ok; -testWallet.getAccountAddress initital_account_state:testWallet.initialAccountState = AccountAddress; -testWallet.getAccountState account_address:accountAddress = testWallet.AccountState; -testWallet.sendGrams private_key:InputKey destination:accountAddress seqno:int32 amount:int64 message:bytes = SendGramsResult; +sync = ton.BlockIdExt; -wallet.init private_key:InputKey = Ok; -wallet.getAccountAddress initital_account_state:wallet.initialAccountState = AccountAddress; -wallet.getAccountState account_address:accountAddress = wallet.AccountState; -wallet.sendGrams private_key:InputKey destination:accountAddress seqno:int32 valid_until:int53 amount:int64 message:bytes = SendGramsResult; +// revision = 0 -- use default revision +// revision = x (x > 0) -- use revision x +// revision = -1 -- use experimental (newest) revision. Only for debug purpose +getAccountAddress initial_account_state:InitialAccountState revision:int32 = AccountAddress; +guessAccountRevision initial_account_state:InitialAccountState = AccountRevisionList; +getAccountState account_address:accountAddress = FullAccountState; +createQuery private_key:InputKey address:accountAddress timeout:int32 action:Action = query.Info; -wallet.v3.getAccountAddress initital_account_state:wallet.v3.initialAccountState = AccountAddress; - -testGiver.getAccountState = testGiver.AccountState; -testGiver.getAccountAddress = AccountAddress; -testGiver.sendGrams destination:accountAddress seqno:int32 amount:int64 message:bytes = SendGramsResult; - -sync = Ok; - -//generic.getAccountAddress initital_account_state:generic.InitialAccountState = AccountAddress; -generic.getAccountState account_address:accountAddress = generic.AccountState; -generic.sendGrams private_key:InputKey source:accountAddress destination:accountAddress amount:int64 timeout:int32 allow_send_to_uninited:Bool message:bytes = SendGramsResult; - -generic.createSendGramsQuery private_key:InputKey source:accountAddress destination:accountAddress amount:int64 timeout:int32 allow_send_to_uninited:Bool message:bytes = query.Info; +msg.decrypt input_key:InputKey data:msg.dataArray = msg.DataArray; query.send id:int53 = Ok; query.forget id:int53 = Ok; query.estimateFees id:int53 ignore_chksig:Bool = query.Fees; +// query.emulate id:int53 ignore_chksig:Bool = query.EmulationResult; query.getInfo id:int53 = query.Info; smc.load account_address:accountAddress = smc.Info; +//smc.forget id:int53 = Ok; smc.getCode id:int53 = tvm.Cell; smc.getData id:int53 = tvm.Cell; smc.getState id:int53 = tvm.Cell; smc.runGetMethod id:int53 method:smc.MethodId stack:vector = smc.RunResult; +dns.resolve account_address:accountAddress name:string category:int32 ttl:int32 = dns.Resolved; + onLiteServerQueryResult id:int64 bytes:bytes = Ok; onLiteServerQueryError id:int64 error:error = Ok; +withBlock id:ton.blockIdExt function:Function = Object; + runTests dir:string = Ok; liteServer.getInfo = liteServer.Info; diff --git a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo index a670da5a67..6a730d89e1 100644 Binary files a/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo and b/submodules/ton/tonlib-src/tl/generate/scheme/tonlib_api.tlo differ diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp index 2c7649cc02..690d843dcd 100644 --- a/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp +++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_java.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "tl_writer_java.h" @@ -34,7 +34,8 @@ int TD_TL_writer_java::get_max_arity() const { bool TD_TL_writer_java::is_built_in_simple_type(const std::string &name) const { return name == "Bool" || name == "Int32" || name == "Int53" || name == "Int64" || name == "Double" || - name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes"; + name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes" || name == "Object" || + name == "Function"; } bool TD_TL_writer_java::is_built_in_complex_type(const std::string &name) const { @@ -168,6 +169,12 @@ std::string TD_TL_writer_java::gen_type_name(const tl::tl_tree_type *tree_type) if (name == "Bytes" || name == "SecureBytes") { return "byte[]"; } + if (name == "Object") { + return gen_base_type_class_name(0); + } + if (name == "Function") { + return gen_base_function_class_name(); + } if (name == "Vector") { assert(t->arity == 1); diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp index 328ea0b463..3eacfe77f4 100644 --- a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp +++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_cpp.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "tl_writer_jni_cpp.h" @@ -24,8 +24,10 @@ namespace td { bool TD_TL_writer_jni_cpp::is_built_in_simple_type(const std::string &name) const { + assert(name != "function"); return name == "Bool" || name == "Int32" || name == "Int53" || name == "Int64" || name == "Double" || - name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes"; + name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes" || name == "Function" || + name == "Object"; } bool TD_TL_writer_jni_cpp::is_built_in_complex_type(const std::string &name) const { @@ -197,6 +199,7 @@ std::string TD_TL_writer_jni_cpp::gen_type_fetch(const std::string &field_name, const tl::tl_tree_type *child = static_cast(tree_type->children[0]); res = gen_vector_fetch(field_name, child, vars, parser_type); } else { + assert(gen_main_class_name(tree_type->type) != "function"); if (field_name == "") { return gen_main_class_name(tree_type->type) + "::fetch(env, p)"; } diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp index 7e12246367..5c9896bd3b 100644 --- a/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp +++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_jni_h.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "tl_writer_jni_h.h" @@ -24,7 +24,8 @@ namespace td { bool TD_TL_writer_jni_h::is_built_in_simple_type(const std::string &name) const { return name == "Bool" || name == "Int32" || name == "Int53" || name == "Int64" || name == "Double" || - name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes"; + name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes" || name == "Function" || + name == "Object"; } bool TD_TL_writer_jni_h::is_built_in_complex_type(const std::string &name) const { diff --git a/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp b/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp index dc4a98f787..dbcc025d50 100644 --- a/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp +++ b/submodules/ton/tonlib-src/tl/generate/tl_writer_td.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "tl_writer_td.h" @@ -124,6 +124,12 @@ std::string TD_TL_writer::gen_class_name(std::string name) const { if (name == "Object") { //assert(false); } + if (name == "function") { + return "Function"; + } + if (name == "object") { + return "Object"; + } if (name == "#") { return "std::int32_t"; } diff --git a/submodules/ton/tonlib-src/ton/ton-types.h b/submodules/ton/tonlib-src/ton/ton-types.h index fac94dc769..a259c505d5 100644 --- a/submodules/ton/tonlib-src/ton/ton-types.h +++ b/submodules/ton/tonlib-src/ton/ton-types.h @@ -23,6 +23,9 @@ #include "td/utils/bits.h" #include "td/utils/Slice.h" #include "td/utils/UInt.h" +#include "td/utils/misc.h" + +#include namespace ton { @@ -140,7 +143,7 @@ struct AccountIdPrefixFull { std::string to_str() const { char buffer[64]; return std::string{ - buffer, (unsigned)snprintf(buffer, 63, "(%d,%016llx)", workchain, (unsigned long long)account_id_prefix)}; + buffer, (unsigned)snprintf(buffer, 63, "(%d,%016llx)", workchain, static_cast(account_id_prefix))}; } }; @@ -158,6 +161,9 @@ struct BlockId { explicit operator ShardIdFull() const { return ShardIdFull{workchain, shard}; } + ShardIdFull shard_full() const { + return ShardIdFull{workchain, shard}; + } bool is_valid() const { return workchain != workchainInvalid; } @@ -200,8 +206,8 @@ struct BlockId { } std::string to_str() const { char buffer[64]; - return std::string{buffer, - (unsigned)snprintf(buffer, 63, "(%d,%016llx,%u)", workchain, (unsigned long long)shard, seqno)}; + return std::string{buffer, (unsigned)snprintf(buffer, 63, "(%d,%016llx,%u)", workchain, + static_cast(shard), seqno)}; } }; @@ -274,6 +280,23 @@ struct BlockIdExt { std::string to_str() const { return id.to_str() + ':' + root_hash.to_hex() + ':' + file_hash.to_hex(); } + static td::Result from_str(td::CSlice s) { + BlockIdExt v; + char rh[65]; + char fh[65]; + auto r = sscanf(s.begin(), "(%d,%" SCNx64 ",%u):%64s:%64s", &v.id.workchain, &v.id.shard, &v.id.seqno, rh, fh); + if (r < 5) { + return td::Status::Error("failed to parse block id"); + } + if (strlen(rh) != 64 || strlen(fh) != 64) { + return td::Status::Error("failed to parse block id: bad roothash/filehash"); + } + TRY_RESULT(re, td::hex_decode(td::Slice(rh, 64))); + v.root_hash.as_slice().copy_from(td::Slice(re)); + TRY_RESULT(fe, td::hex_decode(td::Slice(fh, 64))); + v.file_hash.as_slice().copy_from(td::Slice(fe)); + return v; + } }; struct ZeroStateIdExt { diff --git a/submodules/ton/tonlib-src/tonlib/test/offline.cpp b/submodules/ton/tonlib-src/tonlib/test/offline.cpp index c615397e3c..223c8edad2 100644 --- a/submodules/ton/tonlib-src/tonlib/test/offline.cpp +++ b/submodules/ton/tonlib-src/tonlib/test/offline.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "block/block.h" @@ -35,6 +35,7 @@ #include "td/utils/benchmark.h" #include "td/utils/filesystem.h" #include "td/utils/optional.h" +#include "td/utils/overloaded.h" #include "td/utils/port/path.h" #include "td/utils/PathView.h" #include "td/utils/tests.h" @@ -60,6 +61,23 @@ TEST(Tonlib, CellString) { } }; +TEST(Tonlib, Text) { + for (unsigned size : + {0, 1, 7, 8, 35, 127, 128, 255, 256, (int)vm::CellText::max_bytes - 1, (int)vm::CellText::max_bytes}) { + auto str = td::rand_string('a', 'z', size); + for (unsigned head : {16, 17, 127, 35 * 8, 127 * 8, 1023, 1024}) { + vm::CellBuilder cb; + vm::CellText::store(cb, str, head).ensure(); + auto cs = vm::load_cell_slice(cb.finalize()); + auto cs2 = cs; + cs.print_rec(std::cerr); + CHECK(block::gen::t_Text.validate_exact_upto(1024, cs2)); + auto got_str = vm::CellText::load(cs).move_as_ok(); + ASSERT_EQ(str, got_str); + } + } +}; + using namespace tonlib; TEST(Tonlib, PublicKey) { @@ -126,7 +144,10 @@ TEST(Tonlib, InitClose) { )abc"; sync_send(client, make_object(cfg(bad_config.str()))).ensure_error(); - sync_send(client, make_object()).ensure_error(); + auto address = sync_send(client, make_object( + make_object(), 0)) + .move_as_ok(); + sync_send(client, make_object(std::move(address))).ensure_error(); sync_send(client, make_object()).ensure(); sync_send(client, make_object()).ensure_error(); sync_send(client, make_object(make_object(nullptr, dir(".")))) @@ -134,30 +155,70 @@ TEST(Tonlib, InitClose) { } } -TEST(Tonlib, SimpleEncryption) { +template +void test_encryption() { std::string secret = "secret"; { std::string data = "some private data"; std::string wrong_secret = "wrong secret"; - auto encrypted_data = SimpleEncryption::encrypt_data(data, secret); + auto encrypted_data = Encryption::encrypt_data(data, secret); LOG(ERROR) << encrypted_data.size(); - auto decrypted_data = SimpleEncryption::decrypt_data(encrypted_data, secret).move_as_ok(); + auto decrypted_data = Encryption::decrypt_data(encrypted_data, secret).move_as_ok(); CHECK(data == decrypted_data); - SimpleEncryption::decrypt_data(encrypted_data, wrong_secret).ensure_error(); - SimpleEncryption::decrypt_data("", secret).ensure_error(); - SimpleEncryption::decrypt_data(std::string(32, 'a'), secret).ensure_error(); - SimpleEncryption::decrypt_data(std::string(33, 'a'), secret).ensure_error(); - SimpleEncryption::decrypt_data(std::string(64, 'a'), secret).ensure_error(); - SimpleEncryption::decrypt_data(std::string(128, 'a'), secret).ensure_error(); + Encryption::decrypt_data(encrypted_data, wrong_secret).ensure_error(); + Encryption::decrypt_data("", secret).ensure_error(); + Encryption::decrypt_data(std::string(32, 'a'), secret).ensure_error(); + Encryption::decrypt_data(std::string(33, 'a'), secret).ensure_error(); + Encryption::decrypt_data(std::string(64, 'a'), secret).ensure_error(); + Encryption::decrypt_data(std::string(128, 'a'), secret).ensure_error(); } for (size_t i = 0; i < 255; i++) { auto data = td::rand_string('a', 'z', static_cast(i)); - auto encrypted_data = SimpleEncryption::encrypt_data(data, secret); - auto decrypted_data = SimpleEncryption::decrypt_data(encrypted_data, secret).move_as_ok(); + auto encrypted_data = Encryption::encrypt_data(data, secret); + auto decrypted_data = Encryption::decrypt_data(encrypted_data, secret).move_as_ok(); CHECK(data == decrypted_data); } } +TEST(Tonlib, SimpleEncryption) { + test_encryption(); +} + +TEST(Tonlib, SimpleEncryptionV2) { + test_encryption(); +} + +TEST(Tonlib, SimpleEncryptionAsym) { + auto private_key = td::Ed25519::generate_private_key().move_as_ok(); + auto public_key = private_key.get_public_key().move_as_ok(); + auto other_private_key = td::Ed25519::generate_private_key().move_as_ok(); + auto other_public_key = private_key.get_public_key().move_as_ok(); + auto wrong_private_key = td::Ed25519::generate_private_key().move_as_ok(); + { + std::string data = "some private data"; + auto encrypted_data = SimpleEncryptionV2::encrypt_data(data, public_key, other_private_key).move_as_ok(); + LOG(ERROR) << encrypted_data.size(); + auto decrypted_data = SimpleEncryptionV2::decrypt_data(encrypted_data, private_key).move_as_ok(); + CHECK(data == decrypted_data); + auto decrypted_data2 = SimpleEncryptionV2::decrypt_data(encrypted_data, other_private_key).move_as_ok(); + CHECK(data == decrypted_data2); + SimpleEncryptionV2::decrypt_data(encrypted_data, wrong_private_key).ensure_error(); + SimpleEncryptionV2::decrypt_data("", private_key).ensure_error(); + SimpleEncryptionV2::decrypt_data(std::string(32, 'a'), private_key).ensure_error(); + SimpleEncryptionV2::decrypt_data(std::string(33, 'a'), private_key).ensure_error(); + SimpleEncryptionV2::decrypt_data(std::string(64, 'a'), private_key).ensure_error(); + SimpleEncryptionV2::decrypt_data(std::string(128, 'a'), private_key).ensure_error(); + } + + for (size_t i = 0; i < 255; i++) { + auto data = td::rand_string('a', 'z', static_cast(i)); + auto encrypted_data = SimpleEncryptionV2::encrypt_data(data, public_key, other_private_key).move_as_ok(); + auto decrypted_data = SimpleEncryptionV2::decrypt_data(encrypted_data, private_key).move_as_ok(); + CHECK(data == decrypted_data); + auto decrypted_data2 = SimpleEncryptionV2::decrypt_data(encrypted_data, other_private_key).move_as_ok(); + CHECK(data == decrypted_data2); + } +} class MnemonicBench : public td::Benchmark { public: @@ -437,4 +498,130 @@ TEST(Tonlib, KeysApi) { .move_as_ok(); CHECK(new_imported_key->public_key_ == key->public_key_); CHECK(new_imported_key->secret_ != key->secret_); + + auto exported_raw_key = + sync_send(client, make_object(make_object( + make_object(key->public_key_, new_imported_key->secret_.copy()), + new_local_password.copy()))) + .move_as_ok(); + sync_send(client, make_object( + make_object(new_imported_key->public_key_, new_imported_key->secret_.copy()))) + .move_as_ok(); + td::Ed25519::PrivateKey pkey(exported_raw_key->data_.copy()); + auto raw_imported_key = sync_send(client, make_object(new_local_password.copy(), + std::move(exported_raw_key))) + .move_as_ok(); + + CHECK(raw_imported_key->public_key_ == key->public_key_); + CHECK(raw_imported_key->secret_ != key->secret_); + + auto other_public_key = td::Ed25519::generate_private_key().move_as_ok().get_public_key().move_as_ok(); + std::string text = "hello world"; + + std::vector> elements; + elements.push_back(make_object( + SimpleEncryptionV2::encrypt_data(text, other_public_key, pkey).move_as_ok().as_slice().str())); + + auto decrypted = + sync_send(client, make_object( + make_object( + make_object(key->public_key_, raw_imported_key->secret_.copy()), + new_local_password.copy()), + make_object(std::move(elements)))) + .move_as_ok(); + + downcast_call(*decrypted->elements_[0], + td::overloaded([](auto &) { UNREACHABLE(); }, + [&](tonlib_api::msg_dataDecryptedText &decrypted) { CHECK(decrypted.text_ == text); })); +} + +TEST(Tonlib, ConfigCache) { + using tonlib_api::make_object; + Client client; + + td::mkdir("testdir").ignore(); + // init + sync_send(client, make_object(make_object( + nullptr, make_object("testdir")))) + .ensure(); + + auto testnet = R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "VCSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=", + "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + } + } +})abc"; + auto testnet2 = R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "VXSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=", + "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + } + } +})abc"; + auto testnet3 = R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "ZXSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=", + "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + } + } +})abc"; + auto bad = R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + } + } +})abc"; + sync_send(client, + make_object(make_object(bad, "", true, false))) + .ensure_error(); + + sync_send(client, + make_object(make_object(testnet, "", true, false))) + .ensure(); + sync_send(client, + make_object(make_object(testnet2, "", true, false))) + .ensure(); + sync_send(client, + make_object(make_object(testnet3, "", true, false))) + .ensure(); + + sync_send(client, make_object( + make_object(testnet2, "testnet", true, false))) + .ensure_error(); + + sync_send(client, make_object( + make_object(testnet2, "testnet2", true, false))) + .ensure(); + sync_send(client, make_object( + make_object(testnet3, "testnet2", true, false))) + .ensure_error(); } diff --git a/submodules/ton/tonlib-src/tonlib/test/online.cpp b/submodules/ton/tonlib-src/tonlib/test/online.cpp index 8eabc452e2..d6d4a8944a 100644 --- a/submodules/ton/tonlib-src/tonlib/test/online.cpp +++ b/submodules/ton/tonlib-src/tonlib/test/online.cpp @@ -23,7 +23,7 @@ exception statement from your version. If you delete this exception statement from all source files in the program, then also delete it here. - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "adnl/adnl-ext-client.h" #include "tl-utils/tl-utils.hpp" @@ -37,6 +37,7 @@ #include "Ed25519.h" #include "smc-envelope/GenericAccount.h" +#include "smc-envelope/ManualDns.h" #include "smc-envelope/MultisigWallet.h" #include "smc-envelope/TestGiver.h" #include "smc-envelope/TestWallet.h" @@ -108,6 +109,10 @@ struct Key { struct Wallet { std::string address; Key key; + + auto get_address() const { + return tonlib_api::make_object(address); + } }; struct TransactionId { @@ -116,7 +121,7 @@ struct TransactionId { }; struct AccountState { - enum Type { Empty, Wallet, Unknown } type{Empty}; + enum Type { Empty, Wallet, Dns, Unknown } type{Empty}; td::int64 sync_utime{-1}; td::int64 balance{-1}; TransactionId last_transaction_id; @@ -136,8 +141,17 @@ void sync(Client& client) { static td::uint32 default_wallet_id{0}; std::string wallet_address(Client& client, const Key& key) { return sync_send(client, - make_object( - make_object(key.public_key, default_wallet_id))) + make_object( + make_object(key.public_key, default_wallet_id), 0)) + .move_as_ok() + ->account_address_; +} + +std::string highload_wallet_address(Client& client, const Key& key) { + return sync_send(client, make_object( + make_object(key.public_key, + default_wallet_id), + 1 /*TODO: guess revision!*/)) .move_as_ok() ->account_address_; } @@ -148,35 +162,31 @@ Wallet import_wallet_from_pkey(Client& client, std::string pkey, std::string pas make_object(td::SecureString(pkey)))) .move_as_ok(); Wallet wallet{"", {key->public_key_, std::move(key->secret_)}}; - wallet.address = wallet_address(client, wallet.key); + wallet.address = highload_wallet_address(client, wallet.key); return wallet; } -std::string test_giver_address(Client& client) { - using tonlib_api::make_object; - return sync_send(client, make_object()).move_as_ok()->account_address_; -} - AccountState get_account_state(Client& client, std::string address) { - auto generic_state = sync_send(client, tonlib_api::make_object( - tonlib_api::make_object(address))) - .move_as_ok(); + auto state = sync_send(client, tonlib_api::make_object( + tonlib_api::make_object(address))) + .move_as_ok(); AccountState res; - tonlib_api::downcast_call(*generic_state, [&](auto& state) { - res.balance = state.account_state_->balance_; - res.sync_utime = state.account_state_->sync_utime_; - res.last_transaction_id.lt = state.account_state_->last_transaction_id_->lt_; - res.last_transaction_id.hash = state.account_state_->last_transaction_id_->hash_; - }); + res.balance = state->balance_; + res.sync_utime = state->sync_utime_; + res.last_transaction_id.lt = state->last_transaction_id_->lt_; + res.last_transaction_id.hash = state->last_transaction_id_->hash_; res.address = address; - switch (generic_state->get_id()) { - case tonlib_api::generic_accountStateUninited::ID: + switch (state->account_state_->get_id()) { + case tonlib_api::uninited_accountState::ID: res.type = AccountState::Empty; break; - case tonlib_api::generic_accountStateWalletV3::ID: - case tonlib_api::generic_accountStateWallet::ID: + case tonlib_api::wallet_v3_accountState::ID: + case tonlib_api::wallet_accountState::ID: res.type = AccountState::Wallet; break; + case tonlib_api::dns_accountState::ID: + res.type = AccountState::Dns; + break; default: res.type = AccountState::Unknown; break; @@ -219,13 +229,31 @@ struct QueryInfo { }; td::Result create_send_grams_query(Client& client, const Wallet& source, std::string destination, - td::int64 amount, std::string message, bool force = false, int timeout = 0, - bool fake = false) { - auto r_id = sync_send(client, tonlib_api::make_object( - fake ? source.key.get_fake_input_key() : source.key.get_input_key(), - tonlib_api::make_object(source.address), - tonlib_api::make_object(destination), amount, timeout, - force, std::move(message))); + td::int64 amount, bool encrypted, std::string message, bool force = false, + int timeout = 0, bool fake = false) { + std::vector> msgs; + tonlib_api::object_ptr data; + if (encrypted) { + data = tonlib_api::make_object(std::move(message)); + } else { + data = tonlib_api::make_object(std::move(message)); + } + msgs.push_back(tonlib_api::make_object( + tonlib_api::make_object(destination), amount, std::move(data))); + + auto r_id = + sync_send(client, tonlib_api::make_object( + fake ? source.key.get_fake_input_key() : source.key.get_input_key(), source.get_address(), + timeout, tonlib_api::make_object(std::move(msgs), force))); + TRY_RESULT(id, std::move(r_id)); + return QueryId{id->id_}; +} + +td::Result create_update_dns_query(Client& client, const Wallet& dns, + std::vector> entries) { + using namespace ton::tonlib_api; + auto r_id = sync_send(client, make_object(dns.key.get_input_key(), dns.get_address(), 60, + make_object(std::move(entries)))); TRY_RESULT(id, std::move(r_id)); return QueryId{id->id_}; } @@ -242,7 +270,11 @@ td::Result create_raw_query(Client& client, std::string source, std::st std::pair query_estimate_fees(Client& client, QueryId query_id, bool ignore_chksig = false) { auto fees = sync_send(client, tonlib_api::make_object(query_id.id, ignore_chksig)) .move_as_ok(); - return std::make_pair(to_fee(fees->source_fees_), to_fee(fees->destination_fees_)); + Fee second; + if (!fees->destination_fees_.empty()) { + second = to_fee(fees->destination_fees_[0]); + } + return std::make_pair(to_fee(fees->source_fees_), second); } void query_send(Client& client, QueryId query_id) { @@ -266,26 +298,45 @@ td::Result wait_state_change(Client& client, const AccountState& o } }; -td::Result> get_transactions(Client& client, std::string address, +td::Result> get_transactions(Client& client, + td::optional wallet, + std::string address, const TransactionId& from) { auto got_transactions = sync_send(client, make_object( + wallet ? wallet.value()->key.get_input_key() : nullptr, make_object(address), make_object(from.lt, from.hash))) .move_as_ok(); return std::move(got_transactions); } -td::Status transfer_grams(Client& client, const Wallet& wallet, std::string address, td::int64 amount) { +std::string read_text(tonlib_api::msg_Data& data) { + std::string text; + downcast_call(data, td::overloaded([](auto& other) {}, [&](tonlib_api::msg_dataText& data) { text = data.text_; }, + [&](tonlib_api::msg_dataDecryptedText& data) { text = data.text_; })); + return text; +} + +td::Status transfer_grams(Client& client, const Wallet& wallet, std::string address, td::int64 amount, + bool fast = false) { auto src_state = get_account_state(client, wallet.address); auto dst_state = get_account_state(client, address); auto message = td::rand_string('a', 'z', 500); LOG(INFO) << "Transfer: create query " << (double)amount / Gramm << " from " << wallet.address << " to " << address; - auto r_query_id = create_send_grams_query(client, wallet, address, amount, message); + bool encrypt = true; + auto r_query_id = create_send_grams_query(client, wallet, address, amount, encrypt, message, fast); + if (r_query_id.is_error()) { + LOG(INFO) << "Send query WITHOUT message encryption " << r_query_id.error(); + encrypt = false; + r_query_id = create_send_grams_query(client, wallet, address, amount, encrypt, message, fast); + } else { + LOG(INFO) << "Send query WITH message encryption"; + } if (r_query_id.is_error() && td::begins_with(r_query_id.error().message(), "DANGEROUS_TRANSACTION")) { ASSERT_TRUE(dst_state.type == AccountState::Empty); LOG(INFO) << "Transfer: recreate query due to DANGEROUS_TRANSACTION error"; - r_query_id = create_send_grams_query(client, wallet, address, amount, message, true); + r_query_id = create_send_grams_query(client, wallet, address, amount, false, message, true); } r_query_id.ensure(); @@ -304,6 +355,9 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr LOG(INFO) << "Transfer: send query"; query_send(client, query_id); + if (fast) { + return td::Status::OK(); + } td::Timer timer; TRY_RESULT(new_src_state, wait_state_change(client, src_state, query_info.valid_until)); LOG(INFO) << "Transfer: reached source in " << timer; @@ -311,12 +365,12 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr td::int64 lt; td::int64 first_fee; { - auto tr = get_transactions(client, src_state.address, new_src_state.last_transaction_id).move_as_ok(); + auto tr = get_transactions(client, &wallet, src_state.address, new_src_state.last_transaction_id).move_as_ok(); CHECK(tr->transactions_.size() > 0); const auto& txn = tr->transactions_[0]; CHECK(txn->in_msg_->body_hash_ == query_info.body_hash); ASSERT_EQ(1u, txn->out_msgs_.size()); - ASSERT_EQ(message, txn->out_msgs_[0]->message_); + ASSERT_EQ(message, read_text(*txn->out_msgs_[0]->msg_data_)); lt = txn->out_msgs_[0]->created_lt_; auto fee_difference = fees.first.sum() - txn->fee_; first_fee = txn->fee_; @@ -331,7 +385,7 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr LOG(INFO) << "Transfer: reached destination in " << timer; { - auto tr = get_transactions(client, dst_state.address, new_dst_state.last_transaction_id).move_as_ok(); + auto tr = get_transactions(client, {}, dst_state.address, new_dst_state.last_transaction_id).move_as_ok(); CHECK(tr->transactions_.size() > 0); const auto& txn = tr->transactions_[0]; ASSERT_EQ(lt, txn->in_msg_->created_lt_); @@ -341,7 +395,9 @@ td::Status transfer_grams(Client& client, const Wallet& wallet, std::string addr ASSERT_EQ(new_src_state.address, txn->in_msg_->source_); } ASSERT_EQ(new_src_state.address, txn->in_msg_->source_); - ASSERT_EQ(message, txn->in_msg_->message_); + if (!encrypt) { + ASSERT_EQ(message, read_text(*txn->in_msg_->msg_data_)); + } auto fee_difference = fees.second.sum() - txn->fee_; auto desc = PSTRING() << fee_difference << " storage:[" << fees.second.storage_fee << " vs " << txn->storage_fee_ << "] other:[" << fees.second.sum() - fees.second.storage_fee << " vs " << txn->other_fee_ @@ -361,9 +417,10 @@ Wallet create_empty_wallet(Client& client) { Wallet wallet{"", {key->public_key_, std::move(key->secret_)}}; auto account_address = - sync_send(client, - make_object( - make_object(wallet.key.public_key, default_wallet_id))) + sync_send( + client, + make_object( + make_object(wallet.key.public_key, default_wallet_id), 0)) .move_as_ok(); wallet.address = account_address->account_address_; @@ -376,31 +433,33 @@ Wallet create_empty_wallet(Client& client) { return wallet; } -void dump_transaction_history(Client& client, std::string address) { +Wallet create_empty_dns(Client& client) { using tonlib_api::make_object; - auto state = sync_send(client, make_object()).move_as_ok(); - auto tid = std::move(state->last_transaction_id_); - int cnt = 0; - while (tid->lt_ != 0) { - auto lt = tid->lt_; - auto got_transactions = sync_send(client, make_object( - make_object(address), std::move(tid))) - .move_as_ok(); - CHECK(got_transactions->transactions_.size() > 0); - CHECK(got_transactions->previous_transaction_id_->lt_ < lt); - for (auto& txn : got_transactions->transactions_) { - LOG(ERROR) << to_string(txn); - cnt++; - } - tid = std::move(got_transactions->previous_transaction_id_); - } - LOG(ERROR) << cnt; + auto key = sync_send(client, make_object(td::SecureString("local"), td::SecureString(), + td::SecureString())) + .move_as_ok(); + Wallet dns{"", {key->public_key_, std::move(key->secret_)}}; + + auto account_address = + sync_send(client, make_object( + make_object(dns.key.public_key, default_wallet_id), 0)) + .move_as_ok(); + + dns.address = account_address->account_address_; + + // get state of empty account + auto state = get_account_state(client, dns.address); + ASSERT_EQ(-1, state.balance); + ASSERT_EQ(AccountState::Empty, state.type); + + return dns; } void test_estimate_fees_without_key(Client& client, const Wallet& wallet_a, const Wallet& wallet_b) { LOG(ERROR) << " SUBTEST: estimate fees without key"; { - auto query_id = create_send_grams_query(client, wallet_a, wallet_b.address, 0, "???", true, 0, true).move_as_ok(); + auto query_id = + create_send_grams_query(client, wallet_a, wallet_b.address, 0, false, "???", true, 0, true).move_as_ok(); auto fees1 = query_estimate_fees(client, query_id, false); auto fees2 = query_estimate_fees(client, query_id, true); LOG(INFO) << "Fee without ignore_chksig\t" << fees1; @@ -451,6 +510,7 @@ void test_multisig(Client& client, const Wallet& giver_wallet) { int n = 16; int k = 10; + td::uint32 wallet_id = 7; std::vector private_keys; for (int i = 0; i < n; i++) { private_keys.push_back(td::Ed25519::generate_private_key().move_as_ok()); @@ -458,6 +518,7 @@ void test_multisig(Client& client, const Wallet& giver_wallet) { auto ms = ton::MultisigWallet::create(); auto init_data = ms->create_init_data( + wallet_id, td::transform(private_keys, [](const auto& pk) { return pk.get_public_key().move_as_ok().as_octet_string(); }), k); ms = ton::MultisigWallet::create(init_data); @@ -472,7 +533,7 @@ void test_multisig(Client& client, const Wallet& giver_wallet) { ton::GenericAccount::store_int_message(icb, block::StdAddress::parse(giver_wallet.address).move_as_ok(), 1); icb.store_bytes("\0\0\0\0", 4); vm::CellString::store(icb, "Greatings from multisig", 35 * 8).ensure(); - ton::MultisigWallet::QueryBuilder qb(-1 - i, icb.finalize()); + ton::MultisigWallet::QueryBuilder qb(wallet_id, -1 - i, icb.finalize()); for (int i = 0; i < k - 1; i++) { qb.sign(i, private_keys[i]); } @@ -493,6 +554,66 @@ void test_multisig(Client& client, const Wallet& giver_wallet) { } } +void dns_resolve(Client& client, const Wallet& dns, std::string name) { + using namespace ton::tonlib_api; + auto address = dns.get_address(); + auto resolved = + sync_send(client, make_object<::ton::tonlib_api::dns_resolve>(std::move(address), name, 1, 4)).move_as_ok(); + CHECK(resolved->entries_.size() == 1); + LOG(INFO) << to_string(resolved); + LOG(INFO) << "OK"; +} + +void test_dns(Client& client, const Wallet& giver_wallet) { + auto A = create_empty_dns(client); + auto A_B = create_empty_dns(client); + auto A_B_C = create_empty_dns(client); + transfer_grams(client, giver_wallet, A.address, 1 * Gramm, true).ensure(); + transfer_grams(client, giver_wallet, A_B.address, 1 * Gramm, true).ensure(); + transfer_grams(client, giver_wallet, A_B_C.address, 1 * Gramm, true).ensure(); + + using namespace ton::tonlib_api; + std::vector> actions; + + actions.push_back(make_object( + make_object("A", -1, make_object(A_B.get_address())))); + auto init_A = create_update_dns_query(client, A, std::move(actions)).move_as_ok(); + actions.push_back(make_object( + make_object("B", -1, make_object(A_B_C.get_address())))); + auto init_A_B = create_update_dns_query(client, A_B, std::move(actions)).move_as_ok(); + actions.push_back( + make_object(make_object("C", 1, make_object("Hello dns")))); + auto init_A_B_C = create_update_dns_query(client, A_B_C, std::move(actions)).move_as_ok(); + + LOG(INFO) << "Send dns init queries"; + ::query_send(client, init_A); + ::query_send(client, init_A_B); + ::query_send(client, init_A_B_C); + + auto wait = [&](auto& query, auto& dns) { + auto info = query_get_info(client, query); + LOG(INFO) << "Wait till dns " << dns.address << " is inited " << info.valid_until; + while (true) { + auto state = get_account_state(client, dns.address); + LOG(INFO) << "Account type: " << state.type << " " << state.sync_utime; + if (state.type == ::AccountState::Dns) { + break; + } + if (state.sync_utime >= info.valid_until) { + LOG(FATAL) << "Query expired"; + } + LOG(INFO) << "time left to wait: " << td::format::as_time(info.valid_until - state.sync_utime); + client.receive(1); + } + }; + wait(init_A, A); + wait(init_A_B, A_B); + wait(init_A_B_C, A_B_C); + + // search "C.B.A" + ::dns_resolve(client, A, "C.B.A"); +} + int main(int argc, char* argv[]) { td::set_default_failure_signal_handler(); using tonlib_api::make_object; @@ -533,14 +654,12 @@ int main(int argc, char* argv[]) { Client client; { - auto info = sync_send(client, make_object( - make_object(global_config_str, "", false, false))) + auto info = sync_send(client, make_object(make_object( + make_object(global_config_str, "", false, false), + make_object(keystore_dir)))) .move_as_ok(); - default_wallet_id = static_cast(info->default_wallet_id_); - sync_send(client, make_object(make_object( - make_object(global_config_str, "", false, false), - make_object(keystore_dir)))) - .ensure(); + default_wallet_id = static_cast(info->config_info_->default_wallet_id_); + LOG(ERROR) << default_wallet_id; } // wait till client is synchronized with blockchain. @@ -550,6 +669,7 @@ int main(int argc, char* argv[]) { // give wallet with some test grams to run test auto giver_wallet = import_wallet_from_pkey(client, giver_key_str, giver_key_pwd); + test_dns(client, giver_wallet); test_back_and_forth_transfer(client, giver_wallet, false); test_back_and_forth_transfer(client, giver_wallet, true); test_multisig(client, giver_wallet); diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp index f1ac827156..cd2a73bc01 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp +++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "KeyStorage.h" @@ -179,6 +179,11 @@ td::Result KeyStorage::export_encrypted_key(In return ExportedEncryptedKey{std::move(res.encrypted_data)}; } +td::Result KeyStorage::export_unencrypted_key(InputKey input_key) { + TRY_RESULT(decrypted_key, export_decrypted_key(std::move(input_key))); + return ExportedUnencryptedKey{decrypted_key.private_key.as_octet_string()}; +} + td::Result KeyStorage::import_encrypted_key(td::Slice local_password, td::Slice key_password, ExportedEncryptedKey exported_key) { EncryptedKey encrypted_key{std::move(exported_key.data), td::Ed25519::PublicKey(td::SecureString()), @@ -187,6 +192,14 @@ td::Result KeyStorage::import_encrypted_key(td::Slice local_pas return save_key(std::move(decrypted_key), local_password); } +td::Result KeyStorage::import_unencrypted_key(td::Slice local_password, + ExportedUnencryptedKey exported_key) { + RawDecryptedKey raw_key; + raw_key.private_key = std::move(exported_key.data); + DecryptedKey key(std::move(raw_key)); + return save_key(std::move(key), local_password); +} + KeyStorage::PrivateKey KeyStorage::fake_private_key() { return PrivateKey{td::SecureString(32, 0)}; } diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h index 38478bf1f3..9d012ccdd5 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h +++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyStorage.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -46,6 +46,9 @@ class KeyStorage { struct ExportedEncryptedKey { td::SecureString data; }; + struct ExportedUnencryptedKey { + td::SecureString data; + }; struct PrivateKey { td::SecureString private_key; }; @@ -57,6 +60,7 @@ class KeyStorage { td::Result export_key(InputKey input_key); td::Result export_pem_key(InputKey input_key, td::Slice key_password); td::Result export_encrypted_key(InputKey input_key, td::Slice key_password); + td::Result export_unencrypted_key(InputKey input_key); td::Result change_local_password(InputKey input_key, td::Slice new_local_password); td::Status delete_key(const Key& key); @@ -66,6 +70,7 @@ class KeyStorage { td::Result import_pem_key(td::Slice local_password, td::Slice key_password, ExportedPemKey exported_key); td::Result import_encrypted_key(td::Slice local_password, td::Slice key_password, ExportedEncryptedKey exported_key); + td::Result import_unencrypted_key(td::Slice local_password, ExportedUnencryptedKey exported_key); td::Result load_private_key(InputKey input_key); diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp index ccf9a38372..cdb0f5eeee 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp +++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.cpp @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #include "KeyValue.h" #include "td/utils/filesystem.h" @@ -106,11 +124,7 @@ class KeyValueInmemory : public KeyValue { } private: - class Cmp : public std::less<> { - public: - using is_transparent = void; - }; - std::map map_; + std::map> map_; }; } // namespace detail diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h index 7d2020acc9..33aef44e7f 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h +++ b/submodules/ton/tonlib-src/tonlib/tonlib/KeyValue.h @@ -1,3 +1,21 @@ +/* + 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 . + + Copyright 2017-2020 Telegram Systems LLP +*/ #pragma once #include "td/utils/SharedSlice.h" #include "td/utils/Slice.h" diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h b/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h index 2e0cf2a399..514b4a5953 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h +++ b/submodules/ton/tonlib-src/tonlib/tonlib/LastConfig.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "td/actor/actor.h" @@ -54,7 +54,7 @@ class LastConfig : public td::actor::Actor { QueryState get_config_state_{QueryState::Empty}; std::vector> promises_; - std::vector params_{18, 20, 21, 24, 25}; + std::vector params_{4, 18, 20, 21, 24, 25}; void with_last_block(td::Result r_last_block); void on_config(td::Result> r_config); diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp index 95a089d720..f031596167 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp +++ b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "TonlibClient.h" @@ -29,10 +29,14 @@ #include "tonlib/TonlibError.h" #include "smc-envelope/GenericAccount.h" +#include "smc-envelope/ManualDns.h" #include "smc-envelope/TestWallet.h" #include "smc-envelope/Wallet.h" #include "smc-envelope/WalletV3.h" +#include "smc-envelope/HighloadWallet.h" +#include "smc-envelope/HighloadWalletV2.h" #include "smc-envelope/TestGiver.h" +#include "smc-envelope/SmartContractCode.h" #include "auto/tl/tonlib_api.hpp" #include "block/block-auto.h" @@ -50,22 +54,61 @@ #include "td/utils/tests.h" #include "td/utils/port/path.h" +#include "common/util.h" + namespace tonlib { namespace int_api { struct GetAccountState { block::StdAddress address; + td::optional block_id; using ReturnType = td::unique_ptr; }; + +struct RemoteRunSmcMethod { + block::StdAddress address; + td::optional block_id; + ton::SmartContract::Args args; + bool need_result{false}; + + using ReturnType = RemoteRunSmcMethodReturnType; +}; + +struct RemoteRunSmcMethodReturnType { + ton::SmartContract::State smc_state; + ton::BlockIdExt block_id; + // result + // c7 + // libs +}; + struct GetPrivateKey { KeyStorage::InputKey input_key; using ReturnType = KeyStorage::PrivateKey; }; +struct GetDnsResolver { + using ReturnType = block::StdAddress; +}; struct SendMessage { td::Ref message; using ReturnType = td::Unit; }; } // namespace int_api +template +R downcast_call2(O&& o, F&& f, R res = {}) { + downcast_call(o, [&](auto& x) { res = f(x); }); + return res; +} + +auto to_tonlib_api(const ton::BlockIdExt& blk) { + return tonlib_api::make_object( + blk.id.workchain, blk.id.shard, blk.id.seqno, blk.root_hash.as_slice().str(), blk.file_hash.as_slice().str()); +} + +tonlib_api::object_ptr to_tonlib_api(const TonlibClient::FullConfig& full_config) { + return tonlib_api::make_object(full_config.wallet_id); +} + class TonlibQueryActor : public td::actor::Actor { public: TonlibQueryActor(td::actor::ActorShared client) : client_(std::move(client)) { @@ -95,6 +138,16 @@ static block::AccountState create_account_state(ton::tl_object_ptrstate_); return res; } +static block::AccountState create_account_state(ton::tl_object_ptr& from) { + block::AccountState res; + res.blk = ton::create_block_id(from->id_); + res.shard_blk = ton::create_block_id(from->shardblk_); + res.shard_proof = std::move(from->shard_proof_); + res.proof = std::move(from->proof_); + res.state = std::move(from->state_proof_); + res.is_virtualized = from->mode_ > 0; + return res; +} struct RawAccountState { td::int64 balance = -1; @@ -106,6 +159,7 @@ struct RawAccountState { td::Ref state; std::string frozen_hash; block::AccountState::Info info; + ton::BlockIdExt block_id; }; tonlib_api::object_ptr empty_transaction_id() { @@ -125,12 +179,11 @@ class AccountState { public: AccountState(block::StdAddress address, RawAccountState&& raw, td::uint32 wallet_id) : address_(std::move(address)), raw_(std::move(raw)), wallet_id_(wallet_id) { - wallet_type_ = guess_type(); + guess_type(); } auto to_uninited_accountState() const { - return tonlib_api::make_object(get_balance(), to_transaction_id(raw().info), - raw().frozen_hash, get_sync_time()); + return tonlib_api::make_object(raw().frozen_hash); } td::Result> to_raw_accountState() const { @@ -143,9 +196,22 @@ class AccountState { if (state.data.not_null()) { data = to_bytes(state.data); } - return tonlib_api::make_object(get_balance(), std::move(code), std::move(data), - to_transaction_id(raw().info), raw().frozen_hash, - get_sync_time()); + return tonlib_api::make_object(std::move(code), std::move(data), raw().frozen_hash); + } + + td::Result> to_raw_fullAccountState() const { + auto state = get_smc_state(); + std::string code; + if (state.code.not_null()) { + code = to_bytes(state.code); + } + std::string data; + if (state.data.not_null()) { + data = to_bytes(state.data); + } + return tonlib_api::make_object( + get_balance(), std::move(code), std::move(data), to_transaction_id(raw().info), to_tonlib_api(raw().block_id), + raw().frozen_hash, get_sync_time()); } td::Result> to_testWallet_accountState() const { @@ -153,8 +219,7 @@ class AccountState { return TonlibError::AccountTypeUnexpected("TestWallet"); } TRY_RESULT(seqno, ton::TestWallet(get_smc_state()).get_seqno()); - return tonlib_api::make_object(get_balance(), static_cast(seqno), - to_transaction_id(raw().info), get_sync_time()); + return tonlib_api::make_object(static_cast(seqno)); } td::Result> to_wallet_accountState() const { @@ -162,8 +227,7 @@ class AccountState { return TonlibError::AccountTypeUnexpected("Wallet"); } TRY_RESULT(seqno, ton::Wallet(get_smc_state()).get_seqno()); - return tonlib_api::make_object(get_balance(), static_cast(seqno), - to_transaction_id(raw().info), get_sync_time()); + return tonlib_api::make_object(static_cast(seqno)); } td::Result> to_wallet_v3_accountState() const { if (wallet_type_ != WalletV3) { @@ -172,9 +236,28 @@ class AccountState { auto wallet = ton::WalletV3(get_smc_state()); TRY_RESULT(seqno, wallet.get_seqno()); TRY_RESULT(wallet_id, wallet.get_wallet_id()); - return tonlib_api::make_object( - get_balance(), static_cast(wallet_id), static_cast(seqno), - to_transaction_id(raw().info), get_sync_time()); + return tonlib_api::make_object(static_cast(wallet_id), + static_cast(seqno)); + } + td::Result> to_wallet_highload_v1_accountState() + const { + if (wallet_type_ != HighloadWalletV1) { + return TonlibError::AccountTypeUnexpected("HighloadWalletV1"); + } + auto wallet = ton::HighloadWallet(get_smc_state()); + TRY_RESULT(seqno, wallet.get_seqno()); + TRY_RESULT(wallet_id, wallet.get_wallet_id()); + return tonlib_api::make_object(static_cast(wallet_id), + static_cast(seqno)); + } + td::Result> to_wallet_highload_v2_accountState() + const { + if (wallet_type_ != HighloadWalletV2) { + return TonlibError::AccountTypeUnexpected("HighloadWalletV2"); + } + auto wallet = ton::HighloadWalletV2(get_smc_state()); + TRY_RESULT(wallet_id, wallet.get_wallet_id()); + return tonlib_api::make_object(static_cast(wallet_id)); } td::Result> to_testGiver_accountState() const { @@ -182,41 +265,106 @@ class AccountState { return TonlibError::AccountTypeUnexpected("TestGiver"); } TRY_RESULT(seqno, ton::TestGiver(get_smc_state()).get_seqno()); - return tonlib_api::make_object(get_balance(), static_cast(seqno), - to_transaction_id(raw().info), get_sync_time()); + return tonlib_api::make_object(static_cast(seqno)); } - td::Result> to_generic_accountState() const { - switch (wallet_type_) { - case Empty: - return tonlib_api::make_object(to_uninited_accountState()); - case Unknown: { - TRY_RESULT(res, to_raw_accountState()); - return tonlib_api::make_object(std::move(res)); - } - case Giver: { - TRY_RESULT(res, to_testGiver_accountState()); - return tonlib_api::make_object(std::move(res)); - } - case SimpleWallet: { - TRY_RESULT(res, to_testWallet_accountState()); - return tonlib_api::make_object(std::move(res)); - } - case Wallet: { - TRY_RESULT(res, to_wallet_accountState()); - return tonlib_api::make_object(std::move(res)); - } - case WalletV3: { - TRY_RESULT(res, to_wallet_v3_accountState()); - return tonlib_api::make_object(std::move(res)); - } + td::Result> to_dns_accountState() const { + if (wallet_type_ != ManualDns) { + return TonlibError::AccountTypeUnexpected("ManualDns"); } - UNREACHABLE(); + TRY_RESULT(wallet_id, ton::ManualDns(get_smc_state()).get_wallet_id()); + return tonlib_api::make_object(static_cast(wallet_id)); } - enum WalletType { Empty, Unknown, Giver, SimpleWallet, Wallet, WalletV3 }; + td::Result> to_accountState() const { + auto f = [](auto&& r_x) -> td::Result> { + TRY_RESULT(x, std::move(r_x)); + return std::move(x); + }; + + switch (wallet_type_) { + case Empty: + return to_uninited_accountState(); + case Unknown: + return f(to_raw_accountState()); + case Giver: + return f(to_testGiver_accountState()); + case SimpleWallet: + return f(to_testWallet_accountState()); + case Wallet: + return f(to_wallet_accountState()); + case WalletV3: + return f(to_wallet_v3_accountState()); + case HighloadWalletV1: + return f(to_wallet_highload_v1_accountState()); + case HighloadWalletV2: + return f(to_wallet_highload_v2_accountState()); + case ManualDns: + return f(to_dns_accountState()); + default: + UNREACHABLE(); + } + } + + td::Result> to_fullAccountState() const { + TRY_RESULT(account_state, to_accountState()); + return tonlib_api::make_object(get_balance(), to_transaction_id(raw().info), + to_tonlib_api(raw().block_id), get_sync_time(), + std::move(account_state)); + } + + enum WalletType { + Empty, + Unknown, + Giver, + SimpleWallet, + Wallet, + WalletV3, + HighloadWalletV1, + HighloadWalletV2, + ManualDns + }; WalletType get_wallet_type() const { return wallet_type_; } + bool is_wallet() const { + switch (get_wallet_type()) { + case AccountState::Empty: + case AccountState::Unknown: + case AccountState::ManualDns: + return false; + case AccountState::Giver: + case AccountState::SimpleWallet: + case AccountState::Wallet: + case AccountState::WalletV3: + case AccountState::HighloadWalletV1: + case AccountState::HighloadWalletV2: + return true; + } + UNREACHABLE(); + return false; + } + td::unique_ptr get_wallet() const { + switch (get_wallet_type()) { + case AccountState::Empty: + case AccountState::Unknown: + case AccountState::ManualDns: + return {}; + case AccountState::Giver: + return td::make_unique(get_smc_state()); + case AccountState::SimpleWallet: + return td::make_unique(get_smc_state()); + case AccountState::Wallet: + return td::make_unique(get_smc_state()); + case AccountState::WalletV3: + return td::make_unique(get_smc_state()); + case AccountState::HighloadWalletV1: + return td::make_unique(get_smc_state()); + case AccountState::HighloadWalletV2: + return td::make_unique(get_smc_state()); + } + UNREACHABLE(); + return {}; + } bool is_frozen() const { return !raw_.frozen_hash.empty(); } @@ -233,6 +381,10 @@ class AccountState { return raw_.info.gen_utime; } + ton::BlockIdExt get_block_id() const { + return raw_.block_id; + } + td::int64 get_balance() const { return raw_.balance; } @@ -245,6 +397,29 @@ class AccountState { if (wallet_type_ != WalletType::Empty) { return wallet_type_; } + auto o_revision = ton::WalletV3::guess_revision(address_, key, wallet_id_); + if (o_revision) { + wallet_type_ = WalletType::WalletV3; + wallet_revision_ = o_revision.value(); + set_new_state({ton::WalletV3::get_init_code(wallet_revision_), ton::WalletV3::get_init_data(key, wallet_id_)}); + return wallet_type_; + } + o_revision = ton::HighloadWalletV2::guess_revision(address_, key, wallet_id_); + if (o_revision) { + wallet_type_ = WalletType::HighloadWalletV2; + wallet_revision_ = o_revision.value(); + set_new_state( + {ton::HighloadWalletV2::get_init_code(wallet_revision_), ton::WalletV3::get_init_data(key, wallet_id_)}); + return wallet_type_; + } + o_revision = ton::ManualDns::guess_revision(address_, key, wallet_id_); + if (o_revision) { + wallet_type_ = WalletType::ManualDns; + wallet_revision_ = o_revision.value(); + auto dns = ton::ManualDns::create(key, wallet_id_, wallet_revision_); + set_new_state(dns->get_state()); + return wallet_type_; + } if (ton::GenericAccount::get_address(address_.workchain, ton::TestWallet::get_init_state(key)).addr == address_.addr) { set_new_state({ton::TestWallet::get_init_code(), ton::TestWallet::get_init_data(key)}); @@ -253,10 +428,11 @@ class AccountState { address_.addr) { set_new_state({ton::Wallet::get_init_code(), ton::Wallet::get_init_data(key)}); wallet_type_ = WalletType::Wallet; - } else if (ton::GenericAccount::get_address(address_.workchain, ton::WalletV3::get_init_state(key, wallet_id_)) + } else if (ton::GenericAccount::get_address(address_.workchain, + ton::HighloadWallet::get_init_state(key, wallet_id_)) .addr == address_.addr) { - set_new_state({ton::WalletV3::get_init_code(), ton::WalletV3::get_init_data(key, wallet_id_)}); - wallet_type_ = WalletType::WalletV3; + set_new_state({ton::HighloadWallet::get_init_code(), ton::HighloadWallet::get_init_data(key, wallet_id_)}); + wallet_type_ = WalletType::HighloadWalletV1; } return wallet_type_; } @@ -296,28 +472,48 @@ class AccountState { block::StdAddress address_; RawAccountState raw_; WalletType wallet_type_{Unknown}; + td::int32 wallet_revision_{0}; td::uint32 wallet_id_{0}; bool has_new_state_{false}; - WalletType guess_type() const { + WalletType guess_type() { if (raw_.code.is_null()) { - return WalletType::Empty; + wallet_type_ = WalletType::Empty; + return wallet_type_; } auto code_hash = raw_.code->get_hash(); + auto o_revision = ton::WalletV3::guess_revision(code_hash); + if (o_revision) { + wallet_type_ = WalletType::WalletV3; + wallet_revision_ = o_revision.value(); + return wallet_type_; + } + o_revision = ton::HighloadWalletV2::guess_revision(code_hash); + if (o_revision) { + wallet_type_ = WalletType::HighloadWalletV2; + wallet_revision_ = o_revision.value(); + return wallet_type_; + } + o_revision = ton::ManualDns::guess_revision(code_hash); + if (o_revision) { + wallet_type_ = WalletType::ManualDns; + wallet_revision_ = o_revision.value(); + return wallet_type_; + } + if (code_hash == ton::TestGiver::get_init_code_hash()) { - return WalletType::Giver; + wallet_type_ = WalletType::Giver; + } else if (code_hash == ton::TestWallet::get_init_code_hash()) { + wallet_type_ = WalletType::SimpleWallet; + } else if (code_hash == ton::Wallet::get_init_code_hash()) { + wallet_type_ = WalletType::Wallet; + } else if (code_hash == ton::HighloadWallet::get_init_code_hash()) { + wallet_type_ = WalletType::HighloadWalletV1; + } else { + LOG(WARNING) << "Unknown code hash: " << td::base64_encode(code_hash.as_slice()); + wallet_type_ = WalletType::Unknown; } - if (code_hash == ton::TestWallet::get_init_code_hash()) { - return WalletType::SimpleWallet; - } - if (code_hash == ton::Wallet::get_init_code_hash()) { - return WalletType::Wallet; - } - if (code_hash == ton::WalletV3::get_init_code_hash()) { - return WalletType::WalletV3; - } - LOG(WARNING) << "Unknown code hash: " << td::base64_encode(code_hash.as_slice()); - return WalletType::Unknown; + return wallet_type_; } }; @@ -325,7 +521,7 @@ class Query { public: struct Raw { td::unique_ptr source; - td::unique_ptr destination; + std::vector> destinations; td::uint32 valid_until{std::numeric_limits::max()}; @@ -419,7 +615,7 @@ class Query { } }; - td::Result calc_fwd_fees(td::Ref list, const block::MsgPrices& msg_prices) { + td::Result calc_fwd_fees(td::Ref list, block::MsgPrices** msg_prices, bool is_masterchain) { td::int64 res = 0; std::vector> actions; int n{0}; @@ -457,10 +653,31 @@ class Query { if (!tlb::type_unpack_cell(act_rec.out_msg, block::gen::t_MessageRelaxed_Any, msg)) { return td::Status::Error("estimate_fee: can't parse send_msg"); } + + bool dest_is_masterchain = false; + if (block::gen::t_CommonMsgInfoRelaxed.get_tag(*msg.info) == block::gen::CommonMsgInfoRelaxed::int_msg_info) { + block::gen::CommonMsgInfoRelaxed::Record_int_msg_info info; + if (!tlb::csr_unpack(msg.info, info)) { + return td::Status::Error("estimate_fee: can't parse send_msg"); + } + auto dest_addr = info.dest; + if (!dest_addr->prefetch_ulong(1)) { + return td::Status::Error("estimate_fee: messages with external addresses are unsupported"); + } + int tag = block::gen::t_MsgAddressInt.get_tag(*dest_addr); + + if (tag == block::gen::MsgAddressInt::addr_std) { + block::gen::MsgAddressInt::Record_addr_std recs; + if (!tlb::csr_unpack(dest_addr, recs)) { + return td::Status::Error("estimate_fee: can't parse send_msg"); + } + dest_is_masterchain = recs.workchain_id == ton::masterchainId; + } + } vm::CellStorageStat sstat; // for message size sstat.add_used_storage(msg.init, true, 3); // message init sstat.add_used_storage(msg.body, true, 3); // message body (the root cell itself is not counted) - res += msg_prices.compute_fwd_fees(sstat.cells, sstat.bits); + res += msg_prices[is_masterchain || dest_is_masterchain]->compute_fwd_fees(sstat.cells, sstat.bits); break; } case block::gen::OutAction::action_reserve_currency: @@ -469,34 +686,26 @@ class Query { } return res; } - td::Result> estimate_fees(bool ignore_chksig, const block::Config& cfg) { + td::Result>> estimate_fees(bool ignore_chksig, const block::Config& cfg) { // gas fees bool is_masterchain = raw_.source->get_address().workchain == ton::masterchainId; - bool dest_is_masterchain = raw_.destination && raw_.destination->get_address().workchain == ton::masterchainId; TRY_RESULT(gas_limits_prices, cfg.get_gas_limits_prices(is_masterchain)); - TRY_RESULT(dest_gas_limits_prices, cfg.get_gas_limits_prices(dest_is_masterchain)); - TRY_RESULT(msg_prices, cfg.get_msg_prices(is_masterchain || dest_is_masterchain)); TRY_RESULT(storage_prices, cfg.get_storage_prices()); - + TRY_RESULT(masterchain_msg_prices, cfg.get_msg_prices(true)); + TRY_RESULT(basechain_msg_prices, cfg.get_msg_prices(false)); + block::MsgPrices* msg_prices[2] = {&basechain_msg_prices, &masterchain_msg_prices}; auto storage_fee_256 = block::StoragePrices::compute_storage_fees( raw_.source->get_sync_time(), storage_prices, raw_.source->raw().storage_stat, raw_.source->raw().storage_last_paid, false, is_masterchain); auto storage_fee = storage_fee_256.is_null() ? 0 : storage_fee_256->to_long(); - auto dest_storage_fee_256 = - raw_.destination ? block::StoragePrices::compute_storage_fees( - raw_.destination->get_sync_time(), storage_prices, raw_.destination->raw().storage_stat, - raw_.destination->raw().storage_last_paid, false, is_masterchain) - : td::make_refint(0); - auto dest_storage_fee = dest_storage_fee_256.is_null() ? 0 : dest_storage_fee_256->to_long(); - auto smc = ton::SmartContract::create(raw_.source->get_smc_state()); td::int64 in_fwd_fee = 0; { vm::CellStorageStat sstat; // for message size sstat.add_used_storage(raw_.message, true, 3); // message init - in_fwd_fee += msg_prices.compute_fwd_fees(sstat.cells, sstat.bits); + in_fwd_fee += msg_prices[is_masterchain]->compute_fwd_fees(sstat.cells, sstat.bits); } vm::GasLimits gas_limits = compute_gas_limits(td::make_refint(raw_.source->get_balance()), gas_limits_prices); @@ -510,7 +719,7 @@ class Query { //int out_act_num = output_actions_count(res.actions); //block::gen::OutList{out_act_num}.print_ref(std::cerr, res.actions); - TRY_RESULT_ASSIGN(fwd_fee, calc_fwd_fees(res.actions, msg_prices)); + TRY_RESULT_ASSIGN(fwd_fee, calc_fwd_fees(res.actions, msg_prices, is_masterchain)); } auto gas_fee = res.accepted ? compute_gas_price(res.gas_used, gas_limits_prices)->to_long() : 0; @@ -522,12 +731,25 @@ class Query { fee.gas_fee = gas_fee; fee.fwd_fee = fwd_fee; - Fee dst_fee; - if (raw_.destination && raw_.destination->get_wallet_type() != AccountState::WalletType::Empty) { - dst_fee.gas_fee = dest_gas_limits_prices.flat_gas_price; - dst_fee.storage_fee = dest_storage_fee; + std::vector dst_fees; + + for (auto& destination : raw_.destinations) { + bool dest_is_masterchain = destination && destination->get_address().workchain == ton::masterchainId; + TRY_RESULT(dest_gas_limits_prices, cfg.get_gas_limits_prices(dest_is_masterchain)); + auto dest_storage_fee_256 = + destination ? block::StoragePrices::compute_storage_fees( + destination->get_sync_time(), storage_prices, destination->raw().storage_stat, + destination->raw().storage_last_paid, false, is_masterchain) + : td::make_refint(0); + Fee dst_fee; + auto dest_storage_fee = dest_storage_fee_256.is_null() ? 0 : dest_storage_fee_256->to_long(); + if (destination && destination->get_wallet_type() != AccountState::WalletType::Empty) { + dst_fee.gas_fee = dest_gas_limits_prices.flat_gas_price; + dst_fee.storage_fee = dest_storage_fee; + } + dst_fees.push_back(dst_fee); } - return std::make_pair(fee, dst_fee); + return std::make_pair(fee, dst_fees); } private: @@ -644,20 +866,136 @@ class GetTransactionHistory : public td::actor::Actor { } }; +class RemoteRunSmcMethod : public td::actor::Actor { + public: + RemoteRunSmcMethod(ExtClientRef ext_client_ref, int_api::RemoteRunSmcMethod query, td::actor::ActorShared<> parent, + td::Promise&& promise) + : query_(std::move(query)), promise_(std::move(promise)), parent_(std::move(parent)) { + client_.set_client(ext_client_ref); + } + + private: + int_api::RemoteRunSmcMethod query_; + td::Promise promise_; + td::actor::ActorShared<> parent_; + ExtClient client_; + + void with_run_method_result( + td::Result> r_run_method_result) { + check(do_with_run_method_result(std::move(r_run_method_result))); + } + + td::Status do_with_run_method_result( + td::Result> r_run_method_result) { + TRY_RESULT(run_method_result, std::move(r_run_method_result)); + TRY_RESULT_PREFIX(state, TRY_VM(do_with_run_method_result(std::move(run_method_result))), + TonlibError::ValidateAccountState()); + promise_.set_value(std::move(state)); + stop(); + return td::Status::OK(); + } + td::Result do_with_run_method_result( + ton::tl_object_ptr run_method_result) { + auto account_state = create_account_state(run_method_result); + TRY_RESULT(info, account_state.validate(query_.block_id.value(), query_.address)); + auto serialized_state = account_state.state.clone(); + int_api::RemoteRunSmcMethod::ReturnType res; + res.block_id = query_.block_id.value(); + auto cell = info.root; + if (cell.is_null()) { + return res; + } + block::gen::Account::Record_account account; + if (!tlb::unpack_cell(cell, account)) { + return td::Status::Error("Failed to unpack Account"); + } + + block::gen::AccountStorage::Record storage; + if (!tlb::csr_unpack(account.storage, storage)) { + return td::Status::Error("Failed to unpack AccountStorage"); + } + auto state_tag = block::gen::t_AccountState.get_tag(*storage.state); + if (state_tag < 0) { + return td::Status::Error("Failed to parse AccountState tag"); + } + if (state_tag != block::gen::AccountState::account_active) { + return td::Status::Error("Account is not active"); + } + block::gen::AccountState::Record_account_active state; + if (!tlb::csr_unpack(storage.state, state)) { + return td::Status::Error("Failed to parse AccountState"); + } + block::gen::StateInit::Record state_init; + if (!tlb::csr_unpack(state.x, state_init)) { + return td::Status::Error("Failed to parse StateInit"); + } + state_init.code->prefetch_maybe_ref(res.smc_state.code); + state_init.data->prefetch_maybe_ref(res.smc_state.data); + return res; + } + + void with_last_block(td::Result r_last_block) { + check(do_with_last_block(std::move(r_last_block))); + } + + td::Status with_block_id() { + TRY_RESULT(method_id, query_.args.get_method_id()); + TRY_RESULT(serialized_stack, query_.args.get_serialized_stack()); + client_.send_query( + //liteServer.runSmcMethod mode:# id:tonNode.blockIdExt account:liteServer.accountId method_id:long params:bytes = liteServer.RunMethodResult; + ton::lite_api::liteServer_runSmcMethod( + 0x1f, ton::create_tl_lite_block_id(query_.block_id.value()), + ton::create_tl_object(query_.address.workchain, query_.address.addr), + method_id, std::move(serialized_stack)), + [self = this](auto r_state) { self->with_run_method_result(std::move(r_state)); }, + query_.block_id.value().id.seqno); + return td::Status::OK(); + } + + td::Status do_with_last_block(td::Result r_last_block) { + TRY_RESULT(last_block, std::move(r_last_block)); + query_.block_id = std::move(last_block.last_block_id); + with_block_id(); + return td::Status::OK(); + } + + void start_up() override { + if (query_.block_id) { + check(with_block_id()); + } else { + client_.with_last_block( + [self = this](td::Result r_last_block) { self->with_last_block(std::move(r_last_block)); }); + } + } + + void check(td::Status status) { + if (status.is_error()) { + promise_.set_error(std::move(status)); + stop(); + } + } + void hangup() override { + check(TonlibError::Cancelled()); + } +}; + class GetRawAccountState : public td::actor::Actor { public: - GetRawAccountState(ExtClientRef ext_client_ref, block::StdAddress address, td::actor::ActorShared<> parent, - td::Promise&& promise) - : address_(std::move(address)), promise_(std::move(promise)), parent_(std::move(parent)) { + GetRawAccountState(ExtClientRef ext_client_ref, block::StdAddress address, td::optional block_id, + td::actor::ActorShared<> parent, td::Promise&& promise) + : address_(std::move(address)) + , block_id_(std::move(block_id)) + , promise_(std::move(promise)) + , parent_(std::move(parent)) { client_.set_client(ext_client_ref); } private: block::StdAddress address_; + td::optional block_id_; td::Promise promise_; td::actor::ActorShared<> parent_; ExtClient client_; - LastBlockState last_block_; void with_account_state(td::Result> r_account_state) { check(do_with_account_state(std::move(r_account_state))); @@ -676,14 +1014,14 @@ class GetRawAccountState : public td::actor::Actor { td::Result do_with_account_state( ton::tl_object_ptr raw_account_state) { auto account_state = create_account_state(std::move(raw_account_state)); - TRY_RESULT(info, account_state.validate(last_block_.last_block_id, address_)); + TRY_RESULT(info, account_state.validate(block_id_.value(), address_)); auto serialized_state = account_state.state.clone(); RawAccountState res; + res.block_id = block_id_.value(); res.info = std::move(info); - LOG_IF(ERROR, res.info.gen_utime > last_block_.utime) << res.info.gen_utime << " " << last_block_.utime; auto cell = res.info.root; - std::ostringstream outp; - block::gen::t_Account.print_ref(outp, cell); + //std::ostringstream outp; + //block::gen::t_Account.print_ref(outp, cell); //LOG(INFO) << outp.str(); if (cell.is_null()) { return res; @@ -766,20 +1104,28 @@ class GetRawAccountState : public td::actor::Actor { check(do_with_last_block(std::move(r_last_block))); } - td::Status do_with_last_block(td::Result r_last_block) { - TRY_RESULT_ASSIGN(last_block_, std::move(r_last_block)); + void with_block_id() { client_.send_query( ton::lite_api::liteServer_getAccountState( - ton::create_tl_lite_block_id(last_block_.last_block_id), + ton::create_tl_lite_block_id(block_id_.value()), ton::create_tl_object(address_.workchain, address_.addr)), - [self = this](auto r_state) { self->with_account_state(std::move(r_state)); }, - last_block_.last_block_id.id.seqno); + [self = this](auto r_state) { self->with_account_state(std::move(r_state)); }, block_id_.value().id.seqno); + } + + td::Status do_with_last_block(td::Result r_last_block) { + TRY_RESULT(last_block, std::move(r_last_block)); + block_id_ = std::move(last_block.last_block_id); + with_block_id(); return td::Status::OK(); } void start_up() override { - client_.with_last_block( - [self = this](td::Result r_last_block) { self->with_last_block(std::move(r_last_block)); }); + if (block_id_) { + with_block_id(); + } else { + client_.with_last_block( + [self = this](td::Result r_last_block) { self->with_last_block(std::move(r_last_block)); }); + } } void check(td::Status status) { @@ -867,7 +1213,7 @@ void TonlibClient::update_last_block_state(LastBlockState state, td::uint32 conf return; } - last_block_storage_.save_state(blockchain_name_, state); + last_block_storage_.save_state(last_state_key_, state); } void TonlibClient::update_sync_state(LastBlockSyncState state, td::uint32 config_generation) { @@ -889,7 +1235,7 @@ void TonlibClient::update_sync_state(LastBlockSyncState state, td::uint32 config } } -void TonlibClient::init_last_block(td::optional o_master_config) { +void TonlibClient::init_last_block(LastBlockState state) { ref_cnt_++; class Callback : public LastBlock::Callback { public: @@ -907,31 +1253,8 @@ void TonlibClient::init_last_block(td::optional o_master_config) { td::actor::ActorShared client_; td::uint32 config_generation_; }; - LastBlockState state; - td::Result r_state; - if (!ignore_cache_) { - r_state = last_block_storage_.get_state(blockchain_name_); - } - if (ignore_cache_ || r_state.is_error()) { - LOG_IF(WARNING, !ignore_cache_) << "Unknown LastBlockState: " << r_state.error(); - state.zero_state_id = ton::ZeroStateIdExt(config_.zero_state_id.id.workchain, config_.zero_state_id.root_hash, - config_.zero_state_id.file_hash), - state.last_block_id = config_.zero_state_id; - state.last_key_block_id = config_.zero_state_id; - last_block_storage_.save_state(blockchain_name_, state); - } else { - state = r_state.move_as_ok(); - } - - if (o_master_config) { - auto master_config = o_master_config.unwrap(); - if (master_config.init_block_id.is_valid() && - state.last_key_block_id.id.seqno < master_config.init_block_id.id.seqno) { - state.last_key_block_id = master_config.init_block_id; - LOG(INFO) << "Use init block from MASTER config: " << master_config.init_block_id.to_str(); - } - } + last_block_storage_.save_state(last_state_key_, state); raw_last_block_ = td::actor::create_actor( td::actor::ActorOptions().with_name("LastBlock").with_poll(false), get_client_ref(), std::move(state), config_, @@ -965,6 +1288,16 @@ void TonlibClient::on_update(object_ptr response) { on_result(0, std::move(response)); } +void TonlibClient::make_any_request(tonlib_api::Function& function, QueryContext query_context, + td::Promise>&& promise) { + auto old_context = std::move(query_context_); + SCOPE_EXIT { + query_context_ = std::move(old_context); + }; + query_context_ = std::move(query_context); + downcast_call(function, [&](auto& request) { this->make_request(request, promise.wrap([](auto x) { return x; })); }); +} + void TonlibClient::request(td::uint64 id, tonlib_api::object_ptr function) { VLOG(tonlib_query) << "Tonlib got query " << td::tag("id", id) << " " << to_string(function); if (function == nullptr) { @@ -985,22 +1318,20 @@ void TonlibClient::request(td::uint64 id, tonlib_api::object_ptr::ReturnType; - ref_cnt_++; - td::Promise promise = [actor_id = actor_id(self), id, - tmp = actor_shared(self)](td::Result r_result) { - tonlib_api::object_ptr result; - if (r_result.is_error()) { - result = status_to_tonlib_api(r_result.error()); - } else { - result = r_result.move_as_ok(); - } + ref_cnt_++; + using Object = tonlib_api::object_ptr; + td::Promise promise = [actor_id = actor_id(this), id, tmp = actor_shared(this)](td::Result r_result) { + tonlib_api::object_ptr result; + if (r_result.is_error()) { + result = status_to_tonlib_api(r_result.error()); + } else { + result = r_result.move_as_ok(); + } - send_closure(actor_id, &TonlibClient::on_result, id, std::move(result)); - }; - this->make_request(request, std::move(promise)); - }); + send_closure(actor_id, &TonlibClient::on_result, id, std::move(result)); + }; + + make_any_request(*function, {}, std::move(promise)); } void TonlibClient::close() { stop(); @@ -1013,8 +1344,8 @@ tonlib_api::object_ptr TonlibClient::static_request( return tonlib_api::make_object(400, "Request is empty"); } - tonlib_api::object_ptr response; - downcast_call(*function, [&response](auto& request) { response = TonlibClient::do_static_request(request); }); + auto response = downcast_call2>( + *function, [](auto& request) { return TonlibClient::do_static_request(request); }); VLOG(tonlib_query) << " answer static query " << to_string(response); return response; } @@ -1022,14 +1353,9 @@ tonlib_api::object_ptr TonlibClient::static_request( bool TonlibClient::is_static_request(td::int32 id) { switch (id) { case tonlib_api::runTests::ID: - case tonlib_api::raw_getAccountAddress::ID: - case tonlib_api::testWallet_getAccountAddress::ID: - case tonlib_api::wallet_getAccountAddress::ID: - case tonlib_api::wallet_v3_getAccountAddress::ID: - case tonlib_api::testGiver_getAccountAddress::ID: + case tonlib_api::getAccountAddress::ID: case tonlib_api::packAccountAddress::ID: case tonlib_api::unpackAccountAddress::ID: - case tonlib_api::options_validateConfig::ID: case tonlib_api::getBip39Hints::ID: case tonlib_api::setLogStream::ID: case tonlib_api::getLogStream::ID: @@ -1071,29 +1397,63 @@ td::Result get_public_key(td::Slice public_key) { return address; } -td::Result get_account_address(const tonlib_api::raw_initialAccountState& raw_state) { +td::Result get_account_address(const tonlib_api::raw_initialAccountState& raw_state, + td::int32 revision) { TRY_RESULT_PREFIX(code, vm::std_boc_deserialize(raw_state.code_), TonlibError::InvalidBagOfCells("raw_state.code")); TRY_RESULT_PREFIX(data, vm::std_boc_deserialize(raw_state.data_), TonlibError::InvalidBagOfCells("raw_state.data")); return ton::GenericAccount::get_address(0 /*zerochain*/, ton::GenericAccount::get_init_state(std::move(code), std::move(data))); } -td::Result get_account_address(const tonlib_api::testWallet_initialAccountState& test_wallet_state) { - TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_)); - auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); - return ton::GenericAccount::get_address(0 /*zerochain*/, ton::TestWallet::get_init_state(key)); +td::Result get_account_address(const tonlib_api::testGiver_initialAccountState& test_wallet_state, + td::int32 revision) { + return ton::TestGiver::address(); } -td::Result get_account_address(const tonlib_api::wallet_initialAccountState& test_wallet_state) { +td::Result get_account_address(const tonlib_api::testWallet_initialAccountState& test_wallet_state, + td::int32 revision) { TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_)); auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); - return ton::GenericAccount::get_address(0 /*zerochain*/, ton::Wallet::get_init_state(key)); + return ton::GenericAccount::get_address(0 /*zerochain*/, ton::TestWallet::get_init_state(key, revision)); } -td::Result get_account_address(const tonlib_api::wallet_v3_initialAccountState& test_wallet_state) { + +td::Result get_account_address(const tonlib_api::wallet_initialAccountState& wallet_state, + td::int32 revision) { + TRY_RESULT(key_bytes, get_public_key(wallet_state.public_key_)); + auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); + return ton::GenericAccount::get_address(0 /*zerochain*/, ton::Wallet::get_init_state(key, revision)); +} +td::Result get_account_address(const tonlib_api::wallet_v3_initialAccountState& test_wallet_state, + td::int32 revision) { TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_)); auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); return ton::GenericAccount::get_address( - 0 /*zerochain*/, ton::WalletV3::get_init_state(key, static_cast(test_wallet_state.wallet_id_))); + 0 /*zerochain*/, + ton::WalletV3::get_init_state(key, static_cast(test_wallet_state.wallet_id_), revision)); +} + +td::Result get_account_address( + const tonlib_api::wallet_highload_v1_initialAccountState& test_wallet_state, td::int32 revision) { + TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_)); + auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); + return ton::GenericAccount::get_address( + 0 /*zerochain*/, ton::HighloadWallet::get_init_state(key, static_cast(test_wallet_state.wallet_id_))); +} + +td::Result get_account_address( + const tonlib_api::wallet_highload_v2_initialAccountState& test_wallet_state, td::int32 revision) { + TRY_RESULT(key_bytes, get_public_key(test_wallet_state.public_key_)); + auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); + return ton::GenericAccount::get_address( + 0 /*zerochain*/, + ton::HighloadWalletV2::get_init_state(key, static_cast(test_wallet_state.wallet_id_), revision)); +} + +td::Result get_account_address(const tonlib_api::dns_initialAccountState& dns_state, + td::int32 revision) { + TRY_RESULT(key_bytes, get_public_key(dns_state.public_key_)); + auto key = td::Ed25519::PublicKey(td::SecureString(key_bytes.key)); + return ton::ManualDns::create(key, static_cast(dns_state.wallet_id_), revision)->get_address(); } td::Result get_account_address(td::Slice account_address) { @@ -1101,59 +1461,115 @@ td::Result get_account_address(td::Slice account_address) { return address; } +td::Result get_adnl_address(td::Slice adnl_address) { + TRY_RESULT_PREFIX(address, td::adnl_id_decode(adnl_address), + TonlibError::InvalidField("adnl_address", "can't decode")); + return address; +} + +static td::optional get_wallet_type(tonlib_api::InitialAccountState& state) { + return downcast_call2>( + state, + td::overloaded( + [](const tonlib_api::raw_initialAccountState&) { return td::optional(); }, + [](const tonlib_api::testGiver_initialAccountState&) { return td::optional(); }, + [](const tonlib_api::testWallet_initialAccountState&) { return ton::SmartContractCode::WalletV1; }, + [](const tonlib_api::wallet_initialAccountState&) { return ton::SmartContractCode::WalletV2; }, + [](const tonlib_api::wallet_v3_initialAccountState&) { return ton::SmartContractCode::WalletV3; }, + [](const tonlib_api::wallet_highload_v1_initialAccountState&) { + return ton::SmartContractCode::HighloadWalletV1; + }, + [](const tonlib_api::wallet_highload_v2_initialAccountState&) { + return ton::SmartContractCode::HighloadWalletV2; + }, + [](const tonlib_api::dns_initialAccountState&) { return ton::SmartContractCode::ManualDns; })); +} + tonlib_api::object_ptr TonlibClient::do_static_request( - const tonlib_api::raw_getAccountAddress& request) { - if (!request.initital_account_state_) { + const tonlib_api::getAccountAddress& request) { + if (!request.initial_account_state_) { return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state")); } - auto r_account_address = get_account_address(*request.initital_account_state_); + auto o_type = get_wallet_type(*request.initial_account_state_); + if (o_type) { + auto status = ton::SmartContractCode::validate_revision(o_type.value(), request.revision_); + if (status.is_error()) { + return status_to_tonlib_api(TonlibError::InvalidRevision()); + } + } + auto r_account_address = downcast_call2>( + *request.initial_account_state_, + [&request](auto&& state) { return get_account_address(state, request.revision_); }); if (r_account_address.is_error()) { return status_to_tonlib_api(r_account_address.error()); } return tonlib_api::make_object(r_account_address.ok().rserialize(true)); } -tonlib_api::object_ptr TonlibClient::do_static_request( - const tonlib_api::testWallet_getAccountAddress& request) { - if (!request.initital_account_state_) { - return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state")); +td::Status TonlibClient::do_request(const tonlib_api::guessAccountRevision& request, + td::Promise>&& promise) { + if (!request.initial_account_state_) { + return TonlibError::EmptyField("initial_account_state"); } - if (!request.initital_account_state_) { - return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state")); + auto o_type = get_wallet_type(*request.initial_account_state_); + if (!o_type) { + promise.set_value(tonlib_api::make_object(std::vector{0})); + return td::Status::OK(); } - auto r_account_address = get_account_address(*request.initital_account_state_); - if (r_account_address.is_error()) { - return status_to_tonlib_api(r_account_address.error()); - } - return tonlib_api::make_object(r_account_address.ok().rserialize(true)); -} + auto revisions = ton::SmartContractCode::get_revisions(o_type.value()); -tonlib_api::object_ptr TonlibClient::do_static_request( - const tonlib_api::wallet_getAccountAddress& request) { - if (!request.initital_account_state_) { - return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state")); - } - auto r_account_address = get_account_address(*request.initital_account_state_); - if (r_account_address.is_error()) { - return status_to_tonlib_api(r_account_address.error()); - } - return tonlib_api::make_object(r_account_address.ok().rserialize(true)); -} -tonlib_api::object_ptr TonlibClient::do_static_request( - const tonlib_api::wallet_v3_getAccountAddress& request) { - if (!request.initital_account_state_) { - return status_to_tonlib_api(TonlibError::EmptyField("initial_account_state")); - } - auto r_account_address = get_account_address(*request.initital_account_state_); - if (r_account_address.is_error()) { - return status_to_tonlib_api(r_account_address.error()); - } - return tonlib_api::make_object(r_account_address.ok().rserialize(true)); -} + std::vector> addresses; + TRY_STATUS(downcast_call2(*request.initial_account_state_, [&revisions, &addresses](const auto& state) { + for (auto revision : revisions) { + TRY_RESULT(address, get_account_address(state, revision)); + addresses.push_back(std::make_pair(revision, address)); + } + return td::Status::OK(); + })); -tonlib_api::object_ptr TonlibClient::do_static_request( - const tonlib_api::testGiver_getAccountAddress& request) { - return tonlib_api::make_object(ton::TestGiver::address().rserialize(true)); + auto actor_id = actor_id_++; + class GuessRevisions : public TonlibQueryActor { + public: + GuessRevisions(td::actor::ActorShared client, td::optional block_id, + std::vector> addresses, td::Promise> promise) + : TonlibQueryActor(std::move(client)) + , block_id_(std::move(block_id)) + , addresses_(std::move(addresses)) + , promise_(std::move(promise)) { + } + + private: + td::optional block_id_; + std::vector> addresses_; + td::Promise> promise_; + + size_t left_{0}; + std::vector res; + + void start_up() { + left_ += addresses_.size(); + for (auto& p : addresses_) { + send_query(int_api::GetAccountState{p.second, block_id_.copy()}, + promise_send_closure(td::actor::actor_id(this), &GuessRevisions::on_account_state, p.first)); + } + } + void on_account_state(int revision, td::Result> r_state) { + if (r_state.is_ok() && r_state.ok()->get_wallet_type() != AccountState::WalletType::Empty) { + res.push_back(revision); + } + left_--; + if (left_ == 0) { + promise_.set_value(std::move(res)); + stop(); + } + } + }; + + actors_[actor_id] = td::actor::create_actor( + "GuessRevisions", actor_shared(this, actor_id), query_context_.block_id.copy(), std::move(addresses), + promise.wrap( + [](auto&& x) mutable { return tonlib_api::make_object(std::move(x)); })); + return td::Status::OK(); } tonlib_api::object_ptr TonlibClient::do_static_request( @@ -1190,7 +1606,7 @@ tonlib_api::object_ptr TonlibClient::do_static_request(tonli } td::Status TonlibClient::do_request(const tonlib_api::init& request, - td::Promise>&& promise) { + td::Promise>&& promise) { if (state_ != State::Uninited) { return td::Status::Error(400, "Tonlib is already inited"); } @@ -1201,23 +1617,24 @@ td::Status TonlibClient::do_request(const tonlib_api::init& request, return TonlibError::EmptyField("options.keystore_type"); } - td::Result> r_kv; - downcast_call( + auto r_kv = downcast_call2>>( *request.options_->keystore_type_, td::overloaded( - [&](tonlib_api::keyStoreTypeDirectory& directory) { r_kv = KeyValue::create_dir(directory.directory_); }, - [&](tonlib_api::keyStoreTypeInMemory& inmemory) { r_kv = KeyValue::create_inmemory(); })); + [](tonlib_api::keyStoreTypeDirectory& directory) { return KeyValue::create_dir(directory.directory_); }, + [](tonlib_api::keyStoreTypeInMemory& inmemory) { return KeyValue::create_inmemory(); })); TRY_RESULT(kv, std::move(r_kv)); kv_ = std::shared_ptr(kv.release()); key_storage_.set_key_value(kv_); last_block_storage_.set_key_value(kv_); + auto res = tonlib_api::make_object(); if (request.options_->config_) { TRY_RESULT(full_config, validate_config(std::move(request.options_->config_))); + res->config_info_ = to_tonlib_api(full_config); set_config(std::move(full_config)); } state_ = State::Running; - promise.set_value(tonlib_api::make_object()); + promise.set_value(std::move(res)); return td::Status::OK(); } @@ -1291,21 +1708,55 @@ td::Result TonlibClient::validate_config(tonlib_api::o } td::optional o_master_config; + std::string last_state_key; if (config->blockchain_name_.empty()) { + last_state_key = new_config.zero_state_id.root_hash.as_slice().str(); o_master_config = get_default_master_config().by_root_hash(new_config.zero_state_id.root_hash); } else { + last_state_key = config->blockchain_name_; o_master_config = get_default_master_config().by_name(config->blockchain_name_); } if (o_master_config && o_master_config.value().zero_state_id != new_config.zero_state_id) { return TonlibError::InvalidConfig("zero_state differs from embedded zero_state"); } + + LastBlockState state; + td::Result r_state; + if (!config->ignore_cache_) { + r_state = last_block_storage_.get_state(last_state_key); + } + auto zero_state = ton::ZeroStateIdExt(new_config.zero_state_id.id.workchain, new_config.zero_state_id.root_hash, + new_config.zero_state_id.file_hash); + if (config->ignore_cache_ || r_state.is_error()) { + LOG_IF(WARNING, !config->ignore_cache_) << "Unknown LastBlockState: " << r_state.error(); + state.zero_state_id = zero_state; + state.last_block_id = new_config.zero_state_id; + state.last_key_block_id = new_config.zero_state_id; + } else { + state = r_state.move_as_ok(); + if (state.zero_state_id != zero_state) { + LOG(ERROR) << state.zero_state_id.to_str() << " " << zero_state.to_str(); + return TonlibError::InvalidConfig("zero_state differs from cached zero_state"); + } + } + + if (o_master_config) { + auto master_config = o_master_config.unwrap(); + if (master_config.init_block_id.is_valid() && + state.last_key_block_id.id.seqno < master_config.init_block_id.id.seqno) { + state.last_key_block_id = master_config.init_block_id; + LOG(INFO) << "Use init block from MASTER config: " << master_config.init_block_id.to_str(); + } + } + FullConfig res; res.config = std::move(new_config); - res.o_master_config = std::move(o_master_config); - res.ignore_cache = config->ignore_cache_; res.use_callbacks_for_network = config->use_callbacks_for_network_; res.wallet_id = td::as(res.config.zero_state_id.root_hash.as_slice().data()); + res.last_state_key = std::move(last_state_key); + res.last_state = std::move(state); + return std::move(res); } @@ -1313,12 +1764,11 @@ void TonlibClient::set_config(FullConfig full_config) { config_ = std::move(full_config.config); config_generation_++; wallet_id_ = full_config.wallet_id; - blockchain_name_ = config_.zero_state_id.root_hash.as_slice().str(); + last_state_key_ = full_config.last_state_key; use_callbacks_for_network_ = full_config.use_callbacks_for_network; - ignore_cache_ = full_config.ignore_cache; init_ext_client(); - init_last_block(std::move(full_config.o_master_config)); + init_last_block(std::move(full_config.last_state)); init_last_config(); client_.set_client(get_client_ref()); } @@ -1332,23 +1782,23 @@ td::Status TonlibClient::do_request(const tonlib_api::close& request, return td::Status::OK(); } -tonlib_api::object_ptr TonlibClient::do_static_request( - tonlib_api::options_validateConfig& request) { - auto r_config = validate_config(std::move(request.config_)); - if (r_config.is_error()) { - return status_to_tonlib_api(r_config.move_as_error()); - } - return tonlib_api::make_object(r_config.ok().wallet_id); +td::Status TonlibClient::do_request(tonlib_api::options_validateConfig& request, + td::Promise>&& promise) { + TRY_RESULT(config, validate_config(std::move(request.config_))); + auto res = to_tonlib_api(config); + promise.set_value(std::move(res)); + return td::Status::OK(); } td::Status TonlibClient::do_request(tonlib_api::options_setConfig& request, - td::Promise>&& promise) { + td::Promise>&& promise) { if (!request.config_) { return TonlibError::EmptyField("config"); } TRY_RESULT(config, validate_config(std::move(request.config_))); + auto res = to_tonlib_api(config); set_config(std::move(config)); - promise.set_value(tonlib_api::make_object()); + promise.set_value(std::move(res)); return td::Status::OK(); } @@ -1370,158 +1820,185 @@ td::Result to_std_address_or_throw(td::Ref cs) { td::Result to_std_address(td::Ref cs) { return TRY_VM(to_std_address_or_throw(std::move(cs))); } - -td::Result> to_raw_message_or_throw(td::Ref cell) { - block::gen::Message::Record message; - if (!tlb::type_unpack_cell(cell, block::gen::t_Message_Any, message)) { - return td::Status::Error("Failed to unpack Message"); +struct ToRawTransactions { + explicit ToRawTransactions(td::optional private_key) : private_key_(std::move(private_key)) { } - auto tag = block::gen::CommonMsgInfo().get_tag(*message.info); - if (tag < 0) { - return td::Status::Error("Failed to read CommonMsgInfo tag"); - } - switch (tag) { - case block::gen::CommonMsgInfo::int_msg_info: { - block::gen::CommonMsgInfo::Record_int_msg_info msg_info; - if (!tlb::csr_unpack(message.info, msg_info)) { - return td::Status::Error("Failed to unpack CommonMsgInfo::int_msg_info"); - } + td::optional private_key_; + td::Result> to_raw_message_or_throw(td::Ref cell) { + block::gen::Message::Record message; + if (!tlb::type_unpack_cell(cell, block::gen::t_Message_Any, message)) { + return td::Status::Error("Failed to unpack Message"); + } - TRY_RESULT(balance, to_balance(msg_info.value)); - TRY_RESULT(src, to_std_address(msg_info.src)); - TRY_RESULT(dest, to_std_address(msg_info.dest)); - TRY_RESULT(fwd_fee, to_balance(msg_info.fwd_fee)); - TRY_RESULT(ihr_fee, to_balance(msg_info.ihr_fee)); - auto created_lt = static_cast(msg_info.created_lt); - td::Ref body; - if (message.body->prefetch_long(1) == 0) { - body = std::move(message.body); - body.write().advance(1); - } else { - body = vm::load_cell_slice_ref(message.body->prefetch_ref()); - } - auto body_hash = vm::CellBuilder().append_cellslice(*body).finalize()->get_hash().as_slice().str(); - std::string body_message; - if (body->size() >= 32 && body->prefetch_long(32) == 0) { - body.write().fetch_long(32); - auto r_body_message = vm::CellString::load(body.write()); - if (r_body_message.is_ok()) { - body_message = r_body_message.move_as_ok(); + td::Ref body; + if (message.body->prefetch_long(1) == 0) { + body = std::move(message.body); + body.write().advance(1); + } else { + body = vm::load_cell_slice_ref(message.body->prefetch_ref()); + } + auto body_cell = vm::CellBuilder().append_cellslice(*body).finalize(); + auto body_hash = body_cell->get_hash().as_slice().str(); + + tonlib_api::object_ptr data; + if (body->size() >= 32 && static_cast(body->prefetch_long(32)) <= 1) { + auto type = body.write().fetch_long(32); + td::Status status; + + auto r_body_message = vm::CellString::load(body.write()); + LOG_IF(WARNING, r_body_message.is_error()) << "Failed to parse a message: " << r_body_message.error(); + + if (r_body_message.is_ok()) { + if (type == 0) { + LOG(ERROR) << "OK " << r_body_message.ok(); + data = tonlib_api::make_object(r_body_message.move_as_ok()); + } else { + LOG(ERROR) << "TRY DECRYPT"; + auto encrypted_message = r_body_message.move_as_ok(); + auto r_decrypted_message = [&]() -> td::Result { + if (!private_key_) { + return TonlibError::EmptyField("private_key"); + } + TRY_RESULT(decrypted, SimpleEncryptionV2::decrypt_data(encrypted_message, private_key_.value())); + return decrypted.as_slice().str(); + }(); + if (r_decrypted_message.is_ok()) { + data = tonlib_api::make_object(r_decrypted_message.move_as_ok()); + } else { + data = tonlib_api::make_object(encrypted_message); + } } } - - return tonlib_api::make_object(std::move(src), std::move(dest), balance, fwd_fee, - ihr_fee, created_lt, std::move(body_hash), - std::move(body_message)); } - case block::gen::CommonMsgInfo::ext_in_msg_info: { - block::gen::CommonMsgInfo::Record_ext_in_msg_info msg_info; - if (!tlb::csr_unpack(message.info, msg_info)) { - return td::Status::Error("Failed to unpack CommonMsgInfo::ext_in_msg_info"); + if (!data) { + data = tonlib_api::make_object(to_bytes(std::move(body_cell))); + } + + auto tag = block::gen::CommonMsgInfo().get_tag(*message.info); + if (tag < 0) { + return td::Status::Error("Failed to read CommonMsgInfo tag"); + } + switch (tag) { + case block::gen::CommonMsgInfo::int_msg_info: { + block::gen::CommonMsgInfo::Record_int_msg_info msg_info; + if (!tlb::csr_unpack(message.info, msg_info)) { + return td::Status::Error("Failed to unpack CommonMsgInfo::int_msg_info"); + } + + TRY_RESULT(balance, to_balance(msg_info.value)); + TRY_RESULT(src, to_std_address(msg_info.src)); + TRY_RESULT(dest, to_std_address(msg_info.dest)); + TRY_RESULT(fwd_fee, to_balance(msg_info.fwd_fee)); + TRY_RESULT(ihr_fee, to_balance(msg_info.ihr_fee)); + auto created_lt = static_cast(msg_info.created_lt); + + return tonlib_api::make_object(std::move(src), std::move(dest), balance, fwd_fee, + ihr_fee, created_lt, std::move(body_hash), + std::move(data)); } - TRY_RESULT(dest, to_std_address(msg_info.dest)); - td::Ref body; - if (message.body->prefetch_long(1) == 0) { - body = std::move(message.body); - body.write().advance(1); - } else { - body = vm::load_cell_slice_ref(message.body->prefetch_ref()); + case block::gen::CommonMsgInfo::ext_in_msg_info: { + block::gen::CommonMsgInfo::Record_ext_in_msg_info msg_info; + if (!tlb::csr_unpack(message.info, msg_info)) { + return td::Status::Error("Failed to unpack CommonMsgInfo::ext_in_msg_info"); + } + TRY_RESULT(dest, to_std_address(msg_info.dest)); + return tonlib_api::make_object("", std::move(dest), 0, 0, 0, 0, std::move(body_hash), + std::move(data)); } - auto body_hash = vm::CellBuilder().append_cellslice(*body).finalize()->get_hash().as_slice().str(); - return tonlib_api::make_object("", std::move(dest), 0, 0, 0, 0, std::move(body_hash), - ""); - } - case block::gen::CommonMsgInfo::ext_out_msg_info: { - block::gen::CommonMsgInfo::Record_ext_out_msg_info msg_info; - if (!tlb::csr_unpack(message.info, msg_info)) { - return td::Status::Error("Failed to unpack CommonMsgInfo::ext_out_msg_info"); - } - TRY_RESULT(src, to_std_address(msg_info.src)); - return tonlib_api::make_object(std::move(src), "", 0, 0, 0, 0, "", ""); - } - } - - return td::Status::Error("Unknown CommonMsgInfo tag"); -} - -td::Result> to_raw_message(td::Ref cell) { - return TRY_VM(to_raw_message_or_throw(std::move(cell))); -} - -td::Result> to_raw_transaction_or_throw( - block::Transaction::Info&& info) { - std::string data; - - tonlib_api::object_ptr in_msg; - std::vector> out_msgs; - td::int64 fees = 0; - td::int64 storage_fee = 0; - if (info.transaction.not_null()) { - data = to_bytes(info.transaction); - block::gen::Transaction::Record trans; - if (!tlb::unpack_cell(info.transaction, trans)) { - return td::Status::Error("Failed to unpack Transaction"); - } - - TRY_RESULT_ASSIGN(fees, to_balance(trans.total_fees)); - - //std::ostringstream outp; - //block::gen::t_Transaction.print_ref(outp, info.transaction); - //LOG(INFO) << outp.str(); - - auto is_just = trans.r1.in_msg->prefetch_long(1); - if (is_just == trans.r1.in_msg->fetch_long_eof) { - return td::Status::Error("Failed to parse long"); - } - if (is_just == -1) { - auto msg = trans.r1.in_msg->prefetch_ref(); - TRY_RESULT(in_msg_copy, to_raw_message(trans.r1.in_msg->prefetch_ref())); - in_msg = std::move(in_msg_copy); - } - - if (trans.outmsg_cnt != 0) { - vm::Dictionary dict{trans.r1.out_msgs, 15}; - for (int x = 0; x < trans.outmsg_cnt && x < 100; x++) { - TRY_RESULT(out_msg, to_raw_message(dict.lookup_ref(td::BitArray<15>{x}))); - fees += out_msg->fwd_fee_; - fees += out_msg->ihr_fee_; - out_msgs.push_back(std::move(out_msg)); + case block::gen::CommonMsgInfo::ext_out_msg_info: { + block::gen::CommonMsgInfo::Record_ext_out_msg_info msg_info; + if (!tlb::csr_unpack(message.info, msg_info)) { + return td::Status::Error("Failed to unpack CommonMsgInfo::ext_out_msg_info"); + } + TRY_RESULT(src, to_std_address(msg_info.src)); + return tonlib_api::make_object(std::move(src), "", 0, 0, 0, 0, std::move(body_hash), + std::move(data)); } } - td::RefInt256 storage_fees; - if (!block::tlb::t_TransactionDescr.get_storage_fees(trans.description, storage_fees)) { - return td::Status::Error("Failed to fetch storage fee from transaction"); + + return td::Status::Error("Unknown CommonMsgInfo tag"); + } + + td::Result> to_raw_message(td::Ref cell) { + return TRY_VM(to_raw_message_or_throw(std::move(cell))); + } + + td::Result> to_raw_transaction_or_throw( + block::Transaction::Info&& info) { + std::string data; + + tonlib_api::object_ptr in_msg; + std::vector> out_msgs; + td::int64 fees = 0; + td::int64 storage_fee = 0; + if (info.transaction.not_null()) { + data = to_bytes(info.transaction); + block::gen::Transaction::Record trans; + if (!tlb::unpack_cell(info.transaction, trans)) { + return td::Status::Error("Failed to unpack Transaction"); + } + + TRY_RESULT_ASSIGN(fees, to_balance(trans.total_fees)); + //LOG(ERROR) << fees; + + //std::ostringstream outp; + //block::gen::t_Transaction.print_ref(outp, info.transaction); + //LOG(INFO) << outp.str(); + + auto is_just = trans.r1.in_msg->prefetch_long(1); + if (is_just == trans.r1.in_msg->fetch_long_eof) { + return td::Status::Error("Failed to parse long"); + } + if (is_just == -1) { + auto msg = trans.r1.in_msg->prefetch_ref(); + TRY_RESULT(in_msg_copy, to_raw_message(trans.r1.in_msg->prefetch_ref())); + in_msg = std::move(in_msg_copy); + } + + if (trans.outmsg_cnt != 0) { + vm::Dictionary dict{trans.r1.out_msgs, 15}; + for (int x = 0; x < trans.outmsg_cnt && x < 100; x++) { + TRY_RESULT(out_msg, to_raw_message(dict.lookup_ref(td::BitArray<15>{x}))); + fees += out_msg->fwd_fee_; + fees += out_msg->ihr_fee_; + out_msgs.push_back(std::move(out_msg)); + } + } + td::RefInt256 storage_fees; + if (!block::tlb::t_TransactionDescr.get_storage_fees(trans.description, storage_fees)) { + return td::Status::Error("Failed to fetch storage fee from transaction"); + } + storage_fee = storage_fees->to_long(); } - storage_fee = storage_fees->to_long(); - } - return tonlib_api::make_object( - info.now, data, - tonlib_api::make_object(info.prev_trans_lt, - info.prev_trans_hash.as_slice().str()), - fees, storage_fee, fees - storage_fee, std::move(in_msg), std::move(out_msgs)); -} - -td::Result> to_raw_transaction(block::Transaction::Info&& info) { - return TRY_VM(to_raw_transaction_or_throw(std::move(info))); -} - -td::Result> to_raw_transactions( - block::TransactionList::Info&& info) { - std::vector> transactions; - for (auto& transaction : info.transactions) { - TRY_RESULT(raw_transaction, to_raw_transaction(std::move(transaction))); - transactions.push_back(std::move(raw_transaction)); + return tonlib_api::make_object( + info.now, data, + tonlib_api::make_object(info.prev_trans_lt, + info.prev_trans_hash.as_slice().str()), + fees, storage_fee, fees - storage_fee, std::move(in_msg), std::move(out_msgs)); } - auto transaction_id = - tonlib_api::make_object(info.lt, info.hash.as_slice().str()); - for (auto& transaction : transactions) { - std::swap(transaction->transaction_id_, transaction_id); + td::Result> to_raw_transaction(block::Transaction::Info&& info) { + return TRY_VM(to_raw_transaction_or_throw(std::move(info))); } - return tonlib_api::make_object(std::move(transactions), std::move(transaction_id)); -} + td::Result> to_raw_transactions( + block::TransactionList::Info&& info) { + std::vector> transactions; + for (auto& transaction : info.transactions) { + TRY_RESULT(raw_transaction, to_raw_transaction(std::move(transaction))); + transactions.push_back(std::move(raw_transaction)); + } + + auto transaction_id = + tonlib_api::make_object(info.lt, info.hash.as_slice().str()); + for (auto& transaction : transactions) { + std::swap(transaction->transaction_id_, transaction_id); + } + + return tonlib_api::make_object(std::move(transactions), std::move(transaction_id)); + } +}; // Raw @@ -1559,39 +2036,16 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_createAndSendMessage& } td::Status TonlibClient::do_request(tonlib_api::raw_getAccountState& request, - td::Promise>&& promise) { + td::Promise>&& promise) { if (!request.account_address_) { return TonlibError::EmptyField("account_address"); } TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); - make_request(int_api::GetAccountState{std::move(account_address)}, - promise.wrap([](auto&& res) { return res->to_raw_accountState(); })); + make_request(int_api::GetAccountState{std::move(account_address), query_context_.block_id.copy()}, + promise.wrap([](auto&& res) { return res->to_raw_fullAccountState(); })); return td::Status::OK(); } -td::Status TonlibClient::do_request(tonlib_api::raw_getTransactions& request, - td::Promise>&& promise) { - if (!request.account_address_) { - return TonlibError::EmptyField("account_address"); - } - if (!request.from_transaction_id_) { - return TonlibError::EmptyField("from_transaction_id"); - } - TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); - auto lt = request.from_transaction_id_->lt_; - auto hash_str = request.from_transaction_id_->hash_; - if (hash_str.size() != 32) { - return td::Status::Error(400, "Invalid transaction id hash size"); - } - td::Bits256 hash; - hash.as_slice().copy_from(hash_str); - - auto actor_id = actor_id_++; - actors_[actor_id] = td::actor::create_actor( - "GetTransactionHistory", client_.get_client(), account_address, lt, hash, actor_shared(this, actor_id), - promise.wrap(to_raw_transactions)); - return td::Status::OK(); -} td::Result from_tonlib(tonlib_api::inputKeyRegular& input_key) { if (!input_key.key_) { return TonlibError::EmptyField("key"); @@ -1603,196 +2057,133 @@ td::Result from_tonlib(tonlib_api::inputKeyRegular& input_ } td::Result from_tonlib(tonlib_api::InputKey& input_key) { - td::Result r_key; - tonlib_api::downcast_call( - input_key, td::overloaded([&](tonlib_api::inputKeyRegular& input_key) { r_key = from_tonlib(input_key); }, - [&](tonlib_api::inputKeyFake&) { r_key = KeyStorage::fake_input_key(); })); - return r_key; + return downcast_call2>( + input_key, td::overloaded([&](tonlib_api::inputKeyRegular& input_key) { return from_tonlib(input_key); }, + [&](tonlib_api::inputKeyFake&) { return KeyStorage::fake_input_key(); })); } -// ton::TestWallet -td::Status TonlibClient::do_request(const tonlib_api::testWallet_init& request, - td::Promise>&& promise) { - if (!request.private_key_) { - return td::Status::Error(400, "Field private_key must not be empty"); +td::Status TonlibClient::do_request(tonlib_api::raw_getTransactions& request, + td::Promise>&& promise) { + if (!request.account_address_) { + return TonlibError::EmptyField("account_address"); } - TRY_RESULT(input_key, from_tonlib(*request.private_key_)); - auto init_state = ton::TestWallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy())); - auto address = ton::GenericAccount::get_address(0 /*zerochain*/, init_state); - TRY_RESULT(private_key, key_storage_.load_private_key(std::move(input_key))); - auto init_message = ton::TestWallet::get_init_message(td::Ed25519::PrivateKey(std::move(private_key.private_key))); - auto message = ton::GenericAccount::create_ext_message(address, std::move(init_state), std::move(init_message)); - make_request(int_api::SendMessage{std::move(message)}, to_any_promise(std::move(promise))); + if (!request.from_transaction_id_) { + return TonlibError::EmptyField("from_transaction_id"); + } + TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); + td::optional private_key; + if (request.private_key_) { + TRY_RESULT(input_key, from_tonlib(*request.private_key_)); + //NB: options has lot of problems. We use emplace to migitate them + td::optional o_status; + //NB: rely on (and assert) that GetPrivateKey is a synchonous request + make_request(int_api::GetPrivateKey{std::move(input_key)}, [&](auto&& r_key) { + if (r_key.is_error()) { + o_status.emplace(r_key.move_as_error()); + return; + } + o_status.emplace(td::Status::OK()); + private_key = td::Ed25519::PrivateKey(std::move(r_key.move_as_ok().private_key)); + }); + TRY_STATUS(o_status.unwrap()); + } + auto lt = request.from_transaction_id_->lt_; + auto hash_str = request.from_transaction_id_->hash_; + if (hash_str.size() != 32) { + return td::Status::Error(400, "Invalid transaction id hash size"); + } + td::Bits256 hash; + hash.as_slice().copy_from(hash_str); + + auto actor_id = actor_id_++; + actors_[actor_id] = td::actor::create_actor( + "GetTransactionHistory", client_.get_client(), account_address, lt, hash, actor_shared(this, actor_id), + promise.wrap([private_key = std::move(private_key)](auto&& x) mutable { + return ToRawTransactions(std::move(private_key)).to_raw_transactions(std::move(x)); + })); return td::Status::OK(); } -td::Status TonlibClient::do_request(const tonlib_api::testWallet_sendGrams& request, - td::Promise>&& promise) { - if (!request.destination_) { - return TonlibError::EmptyField("destination"); - } - if (!request.private_key_) { - return TonlibError::EmptyField("private_key"); - } - if (request.message_.size() > ton::TestWallet::max_message_size) { - return TonlibError::MessageTooLong(); - } - TRY_RESULT(account_address, get_account_address(request.destination_->account_address_)); - TRY_RESULT(input_key, from_tonlib(*request.private_key_)); - auto address = ton::GenericAccount::get_address( - 0 /*zerochain*/, ton::TestWallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy()))); - TRY_RESULT(private_key_str, key_storage_.load_private_key(std::move(input_key))); - auto private_key = td::Ed25519::PrivateKey(std::move(private_key_str.private_key)); - td::Ref init_state; - if (request.seqno_ == 0) { - TRY_RESULT_PREFIX(public_key, private_key.get_public_key(), TonlibError::Internal()); - init_state = ton::TestWallet::get_init_state(public_key); - } - auto message = ton::TestWallet::make_a_gift_message(private_key, request.seqno_, request.amount_, request.message_, - account_address); - auto message_hash = message->get_hash().as_slice().str(); - auto new_promise = promise.wrap([message_hash = std::move(message_hash)](auto&&) { - return tonlib_api::make_object(0, std::move(message_hash)); - }); - - auto ext_message = ton::GenericAccount::create_ext_message(address, std::move(init_state), std::move(message)); - make_request(int_api::SendMessage{std::move(message)}, std::move(new_promise)); - return td::Status::OK(); -} - -td::Status TonlibClient::do_request(tonlib_api::testWallet_getAccountState& request, - td::Promise>&& promise) { +td::Status TonlibClient::do_request(const tonlib_api::getAccountState& request, + td::Promise>&& promise) { if (!request.account_address_) { return TonlibError::EmptyField("account_address"); } TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); - make_request(int_api::GetAccountState{std::move(account_address)}, - promise.wrap([](auto&& res) { return res->to_testWallet_accountState(); })); + make_request(int_api::GetAccountState{std::move(account_address), query_context_.block_id.copy()}, + promise.wrap([](auto&& res) { return res->to_fullAccountState(); })); return td::Status::OK(); } -// ton::Wallet -td::Status TonlibClient::do_request(const tonlib_api::wallet_init& request, - td::Promise>&& promise) { - if (!request.private_key_) { - return TonlibError::EmptyField("private_key"); - } - TRY_RESULT(input_key, from_tonlib(*request.private_key_)); - auto init_state = ton::Wallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy())); - auto address = ton::GenericAccount::get_address(0 /*zerochain*/, init_state); - TRY_RESULT(private_key, key_storage_.load_private_key(std::move(input_key))); - auto init_message = ton::Wallet::get_init_message(td::Ed25519::PrivateKey(std::move(private_key.private_key))); - auto message = - ton::GenericAccount::create_ext_message(std::move(address), std::move(init_state), std::move(init_message)); - - make_request(int_api::SendMessage{std::move(message)}, to_any_promise(std::move(promise))); - return td::Status::OK(); -} - -td::Status TonlibClient::do_request(const tonlib_api::wallet_sendGrams& request, - td::Promise>&& promise) { - if (!request.destination_) { - return TonlibError::EmptyField("destination"); - } - if (!request.private_key_) { - return TonlibError::EmptyField("private_key"); - } - if (request.message_.size() > ton::Wallet::max_message_size) { - return TonlibError::MessageTooLong(); - } - TRY_RESULT_PREFIX(valid_until, td::narrow_cast_safe(request.valid_until_), - TonlibError::InvalidField("valid_until", "overflow")); - TRY_RESULT(account_address, get_account_address(request.destination_->account_address_)); - TRY_RESULT(input_key, from_tonlib(*request.private_key_)); - auto address = ton::GenericAccount::get_address( - 0 /*zerochain*/, ton::Wallet::get_init_state(td::Ed25519::PublicKey(input_key.key.public_key.copy()))); - TRY_RESULT(private_key_str, key_storage_.load_private_key(std::move(input_key))); - auto private_key = td::Ed25519::PrivateKey(std::move(private_key_str.private_key)); - td::Ref init_state; - if (request.seqno_ == 0) { - TRY_RESULT_PREFIX(public_key, private_key.get_public_key(), TonlibError::Internal()); - init_state = ton::Wallet::get_init_state(public_key); - } - auto message = ton::Wallet::make_a_gift_message(private_key, request.seqno_, valid_until, request.amount_, - request.message_, account_address); - auto message_hash = message->get_hash().as_slice().str(); - auto new_promise = promise.wrap([valid_until, message_hash = std::move(message_hash)](auto&&) { - return tonlib_api::make_object(valid_until, std::move(message_hash)); - }); - auto ext_message = ton::GenericAccount::create_ext_message(address, std::move(init_state), std::move(message)); - make_request(int_api::SendMessage{std::move(message)}, std::move(new_promise)); - return td::Status::OK(); -} - -td::Status TonlibClient::do_request(tonlib_api::wallet_getAccountState& request, - td::Promise>&& promise) { - if (!request.account_address_) { - return TonlibError::EmptyField("account_address"); - } - TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); - make_request(int_api::GetAccountState{std::move(account_address)}, - promise.wrap([](auto&& res) { return res->to_wallet_accountState(); })); - return td::Status::OK(); -} - -// ton::TestGiver -td::Status TonlibClient::do_request(const tonlib_api::testGiver_sendGrams& request, - td::Promise>&& promise) { - if (!request.destination_) { - return TonlibError::EmptyField("destination"); - } - if (request.message_.size() > ton::TestGiver::max_message_size) { - return TonlibError::MessageTooLong(); - } - TRY_RESULT(account_address, get_account_address(request.destination_->account_address_)); - auto message = - ton::TestGiver::make_a_gift_message(request.seqno_, request.amount_, request.message_, account_address); - auto message_hash = message->get_hash().as_slice().str(); - auto new_promise = promise.wrap([message_hash = std::move(message_hash)](auto&&) { - return tonlib_api::make_object(0, std::move(message_hash)); - }); - - auto ext_message = ton::GenericAccount::create_ext_message(ton::TestGiver::address(), {}, std::move(message)); - make_request(int_api::SendMessage{std::move(message)}, std::move(new_promise)); - return td::Status::OK(); -} - -td::Status TonlibClient::do_request(const tonlib_api::testGiver_getAccountState& request, - td::Promise>&& promise) { - make_request(int_api::GetAccountState{ton::TestGiver::address()}, - promise.wrap([](auto&& res) { return res->to_testGiver_accountState(); })); - return td::Status::OK(); -} - -td::Status TonlibClient::do_request(const tonlib_api::generic_getAccountState& request, - td::Promise>&& promise) { - if (!request.account_address_) { - return TonlibError::EmptyField("account_address"); - } - TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); - make_request(int_api::GetAccountState{std::move(account_address)}, - promise.wrap([](auto&& res) { return res->to_generic_accountState(); })); - return td::Status::OK(); +td::Result to_dns_entry_data(tonlib_api::dns_EntryData& entry_data) { + using R = td::Result; + return downcast_call2( + entry_data, + td::overloaded( + [&](tonlib_api::dns_entryDataUnknown& unknown) -> R { return ton::ManualDns::EntryData(); }, + [&](tonlib_api::dns_entryDataNextResolver& next_resolver) -> R { + if (!next_resolver.resolver_) { + return TonlibError::EmptyField("resolver"); + } + TRY_RESULT(resolver, get_account_address(next_resolver.resolver_->account_address_)); + return ton::ManualDns::EntryData::next_resolver(std::move(resolver)); + }, + [&](tonlib_api::dns_entryDataSmcAddress& smc_address) -> R { + if (!smc_address.smc_address_) { + return TonlibError::EmptyField("smc_address"); + } + TRY_RESULT(address, get_account_address(smc_address.smc_address_->account_address_)); + return ton::ManualDns::EntryData::smc_address(std::move(address)); + }, + [&](tonlib_api::dns_entryDataAdnlAddress& adnl_address) -> R { + if (!adnl_address.adnl_address_) { + return TonlibError::EmptyField("adnl_address"); + } + TRY_RESULT(address, get_adnl_address(adnl_address.adnl_address_->adnl_address_)); + return ton::ManualDns::EntryData::adnl_address(std::move(address)); + }, + [&](tonlib_api::dns_entryDataText& text) -> R { return ton::ManualDns::EntryData::text(text.text_); })); } class GenericCreateSendGrams : public TonlibQueryActor { public: - GenericCreateSendGrams(td::actor::ActorShared client, - tonlib_api::generic_createSendGramsQuery send_grams, - td::Promise>&& promise) - : TonlibQueryActor(std::move(client)), send_grams_(std::move(send_grams)), promise_(std::move(promise)) { + GenericCreateSendGrams(td::actor::ActorShared client, tonlib_api::createQuery query, + td::optional block_id, td::Promise>&& promise) + : TonlibQueryActor(std::move(client)) + , query_(std::move(query)) + , promise_(std::move(promise)) + , block_id_(std::move(block_id)) { } private: - tonlib_api::generic_createSendGramsQuery send_grams_; + tonlib_api::createQuery query_; td::Promise> promise_; td::unique_ptr source_; - td::unique_ptr destination_; + std::vector> destinations_; + size_t destinations_left_ = 0; bool has_private_key_{false}; bool is_fake_key_{false}; td::optional private_key_; td::optional public_key_; + td::optional block_id_; + + struct Action { + block::StdAddress destination; + td::int64 amount; + + bool is_encrypted{false}; + bool should_encrypt; + std::string message; + + td::Ref body; + }; + bool allow_send_to_uninited_{false}; + std::vector actions_; + + // We combine compelty different actions in one actor + // Should be splitted eventually + std::vector dns_actions_; void check(td::Status status) { if (status.is_error()) { @@ -1808,40 +2199,136 @@ class GenericCreateSendGrams : public TonlibQueryActor { check(TonlibError::Cancelled()); } - td::Status do_start_up() { - if (send_grams_.timeout_ < 0 || send_grams_.timeout_ > 300) { - return TonlibError::InvalidField("timeout", "must be between 0 and 300"); + td::Result to_action(const tonlib_api::msg_message& message) { + if (!message.destination_) { + return TonlibError::EmptyField("message.destination"); } - if (!send_grams_.destination_) { - return TonlibError::EmptyField("destination"); - } - if (!send_grams_.source_) { - return TonlibError::EmptyField("source"); - } - if (send_grams_.amount_ < 0) { + Action res; + TRY_RESULT(destination, get_account_address(message.destination_->account_address_)); + res.destination = destination; + if (message.amount_ < 0) { return TonlibError::InvalidField("amount", "can't be negative"); } + res.amount = message.amount_; + auto status = + downcast_call2(*message.data_, td::overloaded( + [&](tonlib_api::msg_dataRaw& text) { + TRY_RESULT(body, vm::std_boc_deserialize(text.body_)); + res.body = std::move(body); + return td::Status::OK(); + }, + [&](tonlib_api::msg_dataText& text) { + res.message = text.text_; + res.should_encrypt = false; + res.is_encrypted = false; + return td::Status::OK(); + }, + [&](tonlib_api::msg_dataDecryptedText& text) { + res.message = text.text_; + if (!has_private_key_) { + return TonlibError::EmptyField("input_key"); + } + res.should_encrypt = true; + res.is_encrypted = true; + return td::Status::OK(); + }, + [&](tonlib_api::msg_dataEncryptedText& text) { + res.message = text.text_; + res.should_encrypt = false; + res.is_encrypted = true; + return td::Status::OK(); + })); // Use this limit as a preventive check - if (send_grams_.message_.size() > ton::Wallet::max_message_size) { + if (res.message.size() > ton::Wallet::max_message_size) { return TonlibError::MessageTooLong(); } - TRY_RESULT(destination_address, get_account_address(send_grams_.destination_->account_address_)); - TRY_RESULT(source_address, get_account_address(send_grams_.source_->account_address_)); + TRY_STATUS(std::move(status)); + return res; + } - has_private_key_ = bool(send_grams_.private_key_); + td::Result to_dns_action(tonlib_api::dns_Action& action) { + using R = td::Result; + return downcast_call2(action, + td::overloaded( + [&](tonlib_api::dns_actionDeleteAll& del_all) -> R { + return ton::ManualDns::Action{"", 0, {}}; + }, + [&](tonlib_api::dns_actionDelete& del) -> R { + TRY_RESULT(category, td::narrow_cast_safe(del.category_)); + return ton::ManualDns::Action{del.name_, category, {}}; + }, + [&](tonlib_api::dns_actionSet& set) -> R { + if (!set.entry_) { + return TonlibError::EmptyField("entry"); + } + if (!set.entry_->entry_) { + return TonlibError::EmptyField("entry.entry"); + } + TRY_RESULT(category, td::narrow_cast_safe(set.entry_->category_)); + TRY_RESULT(entry_data, to_dns_entry_data(*set.entry_->entry_)); + TRY_RESULT(data_cell, entry_data.as_cell()); + return ton::ManualDns::Action{set.entry_->name_, category, std::move(data_cell)}; + })); + } + + td::Status parse_action(tonlib_api::Action& action) { + return downcast_call2(action, + td::overloaded([&](tonlib_api::actionNoop& cell) { return td::Status::OK(); }, + [&](tonlib_api::actionMsg& cell) { + allow_send_to_uninited_ = cell.allow_send_to_uninited_; + for (auto& from_action : cell.messages_) { + if (!from_action) { + return TonlibError::EmptyField("message"); + } + TRY_RESULT(action, to_action(*from_action)); + actions_.push_back(std::move(action)); + } + return td::Status::OK(); + }, + [&](tonlib_api::actionDns& cell) { + for (auto& from_action : cell.actions_) { + if (!from_action) { + return TonlibError::EmptyField("action"); + } + TRY_RESULT(action, to_dns_action(*from_action)); + dns_actions_.push_back(std::move(action)); + } + return td::Status::OK(); + })); + } + + td::Status do_start_up() { + if (query_.timeout_ < 0 || query_.timeout_ > 300) { + return TonlibError::InvalidField("timeout", "must be between 0 and 300"); + } + if (!query_.address_) { + return TonlibError::EmptyField("address"); + } + if (!query_.action_) { + return TonlibError::EmptyField("action"); + } + + TRY_RESULT(source_address, get_account_address(query_.address_->account_address_)); + + has_private_key_ = bool(query_.private_key_); if (has_private_key_) { - TRY_RESULT(input_key, from_tonlib(*send_grams_.private_key_)); - is_fake_key_ = send_grams_.private_key_->get_id() == tonlib_api::inputKeyFake::ID; + TRY_RESULT(input_key, from_tonlib(*query_.private_key_)); + is_fake_key_ = query_.private_key_->get_id() == tonlib_api::inputKeyFake::ID; public_key_ = td::Ed25519::PublicKey(input_key.key.public_key.copy()); send_query(int_api::GetPrivateKey{std::move(input_key)}, promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_private_key)); } + TRY_STATUS(parse_action(*query_.action_)); - send_query(int_api::GetAccountState{source_address}, + send_query(int_api::GetAccountState{source_address, block_id_.copy()}, promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_source_state)); - send_query(int_api::GetAccountState{destination_address}, - promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_destination_state)); + destinations_.resize(actions_.size()); + destinations_left_ = destinations_.size(); + for (size_t i = 0; i < actions_.size(); i++) { + send_query(int_api::GetAccountState{actions_[i].destination, block_id_.copy()}, + promise_send_closure(actor_id(this), &GenericCreateSendGrams::on_destination_state, i)); + } return do_loop(); } @@ -1875,109 +2362,157 @@ class GenericCreateSendGrams : public TonlibQueryActor { return do_loop(); } - void on_destination_state(td::Result> r_state) { - check(do_on_destination_state(std::move(r_state))); + void on_destination_state(size_t i, td::Result> state) { + check(do_on_destination_state(i, std::move(state))); } - td::Status do_on_destination_state(td::Result> r_state) { + td::Status do_on_destination_state(size_t i, td::Result> r_state) { TRY_RESULT(state, std::move(r_state)); - destination_ = std::move(state); - if (destination_->is_frozen()) { + CHECK(destinations_left_ > 0); + destinations_left_--; + destinations_[i] = std::move(state); + auto& destination = *destinations_[i]; + if (destination.is_frozen()) { //FIXME: after restoration of frozen accounts will be supported return TonlibError::TransferToFrozen(); } - if (destination_->get_wallet_type() == AccountState::Empty && destination_->get_address().bounceable) { - if (!send_grams_.allow_send_to_uninited_) { + if (destination.get_wallet_type() == AccountState::Empty && destination.get_address().bounceable) { + if (!allow_send_to_uninited_) { return TonlibError::DangerousTransaction("Transfer to uninited wallet"); } - destination_->make_non_bounceable(); + destination.make_non_bounceable(); LOG(INFO) << "Change destination address from bounceable to non-bounceable "; } return do_loop(); } + td::Status do_dns_loop() { + if (!private_key_) { + return TonlibError::EmptyField("private_key"); + } + + Query::Raw raw; + auto valid_until = source_->get_sync_time(); + valid_until += query_.timeout_ == 0 ? 60 : query_.timeout_; + raw.valid_until = valid_until; + auto dns = ton::ManualDns::create(source_->get_smc_state()); + if (dns_actions_.empty()) { + TRY_RESULT(message_body, dns->create_init_query(private_key_.value(), valid_until)); + raw.message_body = std::move(message_body); + } else { + TRY_RESULT(message_body, dns->create_update_query(private_key_.value(), dns_actions_, valid_until)); + raw.message_body = std::move(message_body); + } + raw.new_state = source_->get_new_state(); + raw.message = ton::GenericAccount::create_ext_message(source_->get_address(), raw.new_state, raw.message_body); + raw.source = std::move(source_); + raw.destinations = std::move(destinations_); + promise_.set_value(td::make_unique(std::move(raw))); + stop(); + return td::Status::OK(); + } + td::Status do_loop() { - if (!source_ || !destination_) { + if (!source_ || destinations_left_ != 0) { return td::Status::OK(); } if (has_private_key_ && !private_key_) { return td::Status::OK(); } - Query::Raw raw; + if (source_->get_wallet_type() == AccountState::ManualDns) { + return do_dns_loop(); + } - auto amount = send_grams_.amount_; - if (amount > source_->get_balance()) { - return TonlibError::NotEnoughFunds(); - } - if (amount == source_->get_balance()) { - amount = -1; - } - auto message = send_grams_.message_; switch (source_->get_wallet_type()) { case AccountState::Empty: return TonlibError::AccountNotInited(); case AccountState::Unknown: return TonlibError::AccountTypeUnknown(); - case AccountState::Giver: { - raw.message_body = ton::TestGiver::make_a_gift_message(0, amount, message, destination_->get_address()); + default: break; - } - - case AccountState::SimpleWallet: { - if (!private_key_) { - return TonlibError::EmptyField("private_key"); - } - if (message.size() > ton::TestWallet::max_message_size) { - return TonlibError::MessageTooLong(); - } - TRY_RESULT(seqno, ton::TestWallet(source_->get_smc_state()).get_seqno()); - raw.message_body = ton::TestWallet::make_a_gift_message(private_key_.unwrap(), seqno, amount, message, - destination_->get_address()); - break; - } - case AccountState::Wallet: { - if (!private_key_) { - return TonlibError::EmptyField("private_key"); - } - if (message.size() > ton::Wallet::max_message_size) { - return TonlibError::MessageTooLong(); - } - TRY_RESULT(seqno, ton::Wallet(source_->get_smc_state()).get_seqno()); - auto valid_until = source_->get_sync_time(); - valid_until += send_grams_.timeout_ == 0 ? 60 : send_grams_.timeout_; - raw.valid_until = valid_until; - raw.message_body = ton::Wallet::make_a_gift_message(private_key_.unwrap(), seqno, valid_until, amount, message, - destination_->get_address()); - break; - } - case AccountState::WalletV3: { - if (!private_key_) { - return TonlibError::EmptyField("private_key"); - } - if (message.size() > ton::WalletV3::max_message_size) { - return TonlibError::MessageTooLong(); - } - auto wallet = ton::WalletV3(source_->get_smc_state()); - TRY_RESULT(seqno, wallet.get_seqno()); - TRY_RESULT(wallet_id, wallet.get_wallet_id()); - auto valid_until = source_->get_sync_time(); - valid_until += send_grams_.timeout_ == 0 ? 60 : send_grams_.timeout_; - raw.valid_until = valid_until; - raw.message_body = ton::WalletV3::make_a_gift_message(private_key_.unwrap(), wallet_id, seqno, valid_until, - amount, message, destination_->get_address()); - break; - } } - raw.new_state = source_->get_new_state(); - raw.message = ton::GenericAccount::create_ext_message(source_->get_address(), raw.new_state, raw.message_body); - raw.source = std::move(source_); - raw.destination = std::move(destination_); + if (!source_->is_wallet()) { + return TonlibError::AccountActionUnsupported("wallet action"); + } - promise_.set_value(td::make_unique(std::move(raw))); - stop(); - return td::Status::OK(); + td::int64 amount = 0; + for (auto& action : actions_) { + amount += action.amount; + } + + if (amount > source_->get_balance()) { + return TonlibError::NotEnoughFunds(); + } + + auto valid_until = source_->get_sync_time(); + valid_until += query_.timeout_ == 0 ? 60 : query_.timeout_; + std::vector gifts; + size_t i = 0; + for (auto& action : actions_) { + ton::HighloadWalletV2::Gift gift; + auto& destination = destinations_[i]; + gift.destination = destinations_[i]->get_address(); + gift.gramms = action.amount; + if (action.amount == source_->get_balance()) { + gift.gramms = -1; + } + if (action.body.not_null()) { + gift.body = action.body; + } else if (action.should_encrypt) { + LOG(ERROR) << "TRY ENCRYPT"; + if (!private_key_) { + return TonlibError::EmptyField("private_key"); + } + if (!destination->is_wallet()) { + return TonlibError::MessageEncryption("Get public key (in destination)"); + } + auto wallet = destination->get_wallet(); + TRY_RESULT_PREFIX(public_key, wallet->get_public_key(), + TonlibError::AccountActionUnsupported(PSLICE() << "Get public key (in destination) : " + << destination->get_wallet_type())); + TRY_RESULT_PREFIX(encrypted_message, + SimpleEncryptionV2::encrypt_data(action.message, public_key, private_key_.value()), + TonlibError::Internal()); + gift.message = encrypted_message.as_slice().str(); + gift.is_encrypted = true; + } else { + gift.message = action.message; + gift.is_encrypted = action.is_encrypted; + } + i++; + gifts.push_back(gift); + } + + Query::Raw raw; + auto with_wallet = [&](auto&& wallet) { + if (!private_key_) { + return TonlibError::EmptyField("private_key"); + } + if (wallet.get_max_gifts_size() < gifts.size()) { + return TonlibError::MessageTooLong(); // TODO: other error + } + + raw.valid_until = valid_until; + TRY_RESULT(message_body, wallet.make_a_gift_message(private_key_.unwrap(), valid_until, gifts)); + raw.message_body = std::move(message_body); + raw.new_state = source_->get_new_state(); + raw.message = ton::GenericAccount::create_ext_message(source_->get_address(), raw.new_state, raw.message_body); + raw.source = std::move(source_); + raw.destinations = std::move(destinations_); + + promise_.set_value(td::make_unique(std::move(raw))); + stop(); + return td::Status::OK(); + }; + + if (source_->get_wallet_type() == AccountState::Giver) { + valid_until = 0; + private_key_ = td::Ed25519::PrivateKey(td::SecureString(std::string(32, '\0'))); + } + + return with_wallet(*source_->get_wallet()); } }; @@ -2002,24 +2537,50 @@ void TonlibClient::finish_create_query(td::Result> r_query auto id = register_query(std::move(query)); promise.set_result(get_query_info(id)); } -void TonlibClient::finish_send_query(td::Result> r_query, - td::Promise>&& promise) { - TRY_RESULT_PROMISE(promise, query, std::move(r_query)); - auto result = tonlib_api::make_object(query->get_valid_until(), - query->get_body_hash().as_slice().str()); - auto id = register_query(std::move(query)); - make_request(tonlib_api::query_send(id), - promise.wrap([result = std::move(result)](auto&&) mutable { return std::move(result); })); -} -td::Status TonlibClient::do_request(tonlib_api::generic_createSendGramsQuery& request, + +td::Status TonlibClient::do_request(tonlib_api::createQuery& request, td::Promise>&& promise) { auto id = actor_id_++; actors_[id] = td::actor::create_actor( - "GenericSendGrams", actor_shared(this, id), std::move(request), + "GenericSendGrams", actor_shared(this, id), std::move(request), query_context_.block_id.copy(), promise.send_closure(actor_id(this), &TonlibClient::finish_create_query)); return td::Status::OK(); } +td::Status TonlibClient::do_request(tonlib_api::msg_decrypt& request, + td::Promise>&& promise) { + if (!request.input_key_) { + return TonlibError::EmptyField("input_key"); + } + if (!request.data_) { + return TonlibError::EmptyField("data"); + } + TRY_RESULT(input_key, from_tonlib(*request.input_key_)); + make_request( + int_api::GetPrivateKey{std::move(input_key)}, + promise.wrap([elements = std::move(request.data_)](auto key) mutable { + auto private_key = td::Ed25519::PrivateKey(std::move(key.private_key)); + elements->elements_ = td::transform(std::move(elements->elements_), [&private_key](auto msg) { + if (!msg) { + return std::move(msg); + } + using ReturnType = tonlib_api::object_ptr; + return downcast_call2( + *msg, td::overloaded([&msg](auto&) { return std::move(msg); }, + [&msg, &private_key](tonlib_api::msg_dataEncryptedText& encrypted) -> ReturnType { + auto r_decrypted = SimpleEncryptionV2::decrypt_data(encrypted.text_, private_key); + if (r_decrypted.is_error()) { + return std::move(msg); + } + return tonlib_api::make_object( + r_decrypted.move_as_ok().as_slice().str()); + })); + }); + return std::move(elements); + })); + return td::Status::OK(); +} + td::Status TonlibClient::do_request(const tonlib_api::raw_createQuery& request, td::Promise>&& promise) { if (!request.destination_) { @@ -2038,7 +2599,7 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_createQuery& request, td::Promise> new_promise = promise.send_closure(actor_id(this), &TonlibClient::finish_create_query); - make_request(int_api::GetAccountState{account_address}, + make_request(int_api::GetAccountState{account_address, query_context_.block_id.copy()}, new_promise.wrap([smc_state = std::move(smc_state), body = std::move(body)](auto&& source) mutable { Query::Raw raw; if (smc_state) { @@ -2049,24 +2610,11 @@ td::Status TonlibClient::do_request(const tonlib_api::raw_createQuery& request, raw.message = ton::GenericAccount::create_ext_message(source->get_address(), raw.new_state, raw.message_body); raw.source = std::move(source); - raw.destination = nullptr; return td::make_unique(std::move(raw)); })); return td::Status::OK(); } -td::Status TonlibClient::do_request(tonlib_api::generic_sendGrams& request, - td::Promise>&& promise) { - auto id = actor_id_++; - actors_[id] = td::actor::create_actor( - "GenericSendGrams", actor_shared(this, id), - tonlib_api::generic_createSendGramsQuery(std::move(request.private_key_), std::move(request.source_), - std::move(request.destination_), request.amount_, request.timeout_, - request.allow_send_to_uninited_, std::move(request.message_)), - promise.send_closure(actor_id(this), &TonlibClient::finish_send_query)); - return td::Status::OK(); -} - td::Status TonlibClient::do_request(const tonlib_api::query_getInfo& request, td::Promise>&& promise) { promise.set_result(get_query_info(request.id_)); @@ -2083,8 +2631,8 @@ void TonlibClient::query_estimate_fees(td::int64 id, bool ignore_chksig, td::Res TRY_RESULT_PROMISE(promise, state, std::move(r_state)); TRY_RESULT_PROMISE_PREFIX(promise, fees, TRY_VM(it->second->estimate_fees(ignore_chksig, *state.config)), TonlibError::Internal()); - promise.set_value( - tonlib_api::make_object(fees.first.to_tonlib_api(), fees.second.to_tonlib_api())); + promise.set_value(tonlib_api::make_object( + fees.first.to_tonlib_api(), td::transform(fees.second, [](auto& x) { return x.to_tonlib_api(); }))); } td::Status TonlibClient::do_request(const tonlib_api::query_estimateFees& request, @@ -2154,7 +2702,7 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_load& request, return TonlibError::EmptyField("account_address"); } TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); - make_request(int_api::GetAccountState{std::move(account_address)}, + make_request(int_api::GetAccountState{std::move(account_address), query_context_.block_id.copy()}, promise.send_closure(actor_id(this), &TonlibClient::finish_load_smc)); return td::Status::OK(); } @@ -2195,6 +2743,98 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_getState& request, return td::Status::OK(); } +bool is_list(vm::StackEntry entry) { + while (true) { + if (entry.type() == vm::StackEntry::Type::t_null) { + return true; + } + if (entry.type() != vm::StackEntry::Type::t_tuple) { + return false; + } + if (entry.as_tuple()->size() != 2) { + return false; + } + entry = entry.as_tuple()->at(1); + } +}; +auto to_tonlib_api(const vm::StackEntry& entry) -> tonlib_api::object_ptr { + switch (entry.type()) { + case vm::StackEntry::Type::t_int: + return tonlib_api::make_object( + tonlib_api::make_object(dec_string(entry.as_int()))); + case vm::StackEntry::Type::t_slice: + return tonlib_api::make_object(tonlib_api::make_object( + to_bytes(vm::CellBuilder().append_cellslice(entry.as_slice()).finalize()))); + case vm::StackEntry::Type::t_cell: + return tonlib_api::make_object( + tonlib_api::make_object(to_bytes(entry.as_cell()))); + case vm::StackEntry::Type::t_null: + case vm::StackEntry::Type::t_tuple: { + std::vector> elements; + if (is_list(entry)) { + auto node = entry; + while (node.type() == vm::StackEntry::Type::t_tuple) { + elements.push_back(to_tonlib_api(node.as_tuple()->at(0))); + node = node.as_tuple()->at(1); + } + return tonlib_api::make_object( + tonlib_api::make_object(std::move(elements))); + + } else { + for (auto& element : *entry.as_tuple()) { + elements.push_back(to_tonlib_api(element)); + } + return tonlib_api::make_object( + tonlib_api::make_object(std::move(elements))); + } + } + + default: + return tonlib_api::make_object(); + } +}; + +td::Result from_tonlib_api(tonlib_api::tvm_StackEntry& entry) { + // TODO: error codes + // downcast_call + return downcast_call2>( + entry, + td::overloaded( + [&](tonlib_api::tvm_stackEntryUnsupported& cell) { return td::Status::Error("Unsuppored stack entry"); }, + [&](tonlib_api::tvm_stackEntrySlice& cell) -> td::Result { + TRY_RESULT(res, vm::std_boc_deserialize(cell.slice_->bytes_)); + return vm::StackEntry{std::move(res)}; + }, + [&](tonlib_api::tvm_stackEntryCell& cell) -> td::Result { + TRY_RESULT(res, vm::std_boc_deserialize(cell.cell_->bytes_)); + return vm::StackEntry{std::move(res)}; + }, + [&](tonlib_api::tvm_stackEntryTuple& tuple) -> td::Result { + std::vector elements; + for (auto& element : tuple.tuple_->elements_) { + TRY_RESULT(new_element, from_tonlib_api(*element)); + elements.push_back(std::move(new_element)); + } + return td::Ref(true, std::move(elements)); + }, + [&](tonlib_api::tvm_stackEntryList& tuple) -> td::Result { + vm::StackEntry tail; + for (auto& element : td::reversed(tuple.list_->elements_)) { + TRY_RESULT(new_element, from_tonlib_api(*element)); + tail = vm::make_tuple_ref(std::move(new_element), std::move(tail)); + } + return tail; + }, + [&](tonlib_api::tvm_stackEntryNumber& number) -> td::Result { + auto& dec = *number.number_; + auto num = td::dec_string_to_int256(dec.number_); + if (num.is_null()) { + return td::Status::Error("Failed to parse dec string to int256"); + } + return num; + })); +} + td::Status TonlibClient::do_request(const tonlib_api::smc_runGetMethod& request, td::Promise>&& promise) { auto it = smcs_.find(request.id_); @@ -2209,72 +2849,137 @@ td::Status TonlibClient::do_request(const tonlib_api::smc_runGetMethod& request, [&](tonlib_api::smc_methodIdName& name) { args.set_method_id(name.name_); })); td::Ref stack(true); td::Status status; - // TODO: error codes - // downcast_call for (auto& entry : request.stack_) { - downcast_call(*entry, td::overloaded( - [&](tonlib_api::tvm_stackEntryUnsupported& cell) { - status = td::Status::Error("Unsuppored stack entry"); - }, - [&](tonlib_api::tvm_stackEntrySlice& cell) { - auto r_cell = vm::std_boc_deserialize(cell.slice_->bytes_); - if (r_cell.is_error()) { - status = r_cell.move_as_error(); - return; - } - stack.write().push_cell(r_cell.move_as_ok()); - }, - [&](tonlib_api::tvm_stackEntryCell& cell) { - auto r_cell = vm::std_boc_deserialize(cell.cell_->bytes_); - if (r_cell.is_error()) { - status = r_cell.move_as_error(); - return; - } - stack.write().push_cell(r_cell.move_as_ok()); - }, - [&](tonlib_api::tvm_stackEntryNumber& number) { - [&](tonlib_api::tvm_numberDecimal& dec) { - auto num = td::dec_string_to_int256(dec.number_); - if (num.is_null()) { - status = td::Status::Error("Failed to parse dec string to int256"); - return; - } - stack.write().push_int(std::move(num)); - }(*number.number_); - })); + TRY_RESULT(e, from_tonlib_api(*entry)); + stack.write().push(std::move(e)); } - TRY_STATUS(std::move(status)); args.set_stack(std::move(stack)); auto res = smc->run_get_method(std::move(args)); // smc.runResult gas_used:int53 stack:vector exit_code:int32 = smc.RunResult; std::vector> res_stack; for (auto& entry : res.stack->as_span()) { - switch (entry.type()) { - case vm::StackEntry::Type::t_int: - res_stack.push_back(tonlib_api::make_object( - tonlib_api::make_object(dec_string(entry.as_int())))); - break; - case vm::StackEntry::Type::t_slice: - res_stack.push_back( - tonlib_api::make_object(tonlib_api::make_object( - to_bytes(vm::CellBuilder().append_cellslice(entry.as_slice()).finalize())))); - break; - case vm::StackEntry::Type::t_cell: - res_stack.push_back(tonlib_api::make_object( - tonlib_api::make_object(to_bytes(entry.as_cell())))); - break; - default: - res_stack.push_back(tonlib_api::make_object()); - break; - } + res_stack.push_back(to_tonlib_api(entry)); } promise.set_value(tonlib_api::make_object(res.gas_used, std::move(res_stack), res.code)); return td::Status::OK(); } -td::Status TonlibClient::do_request(tonlib_api::sync& request, td::Promise>&& promise) { - client_.with_last_block(to_any_promise(std::move(promise))); +td::Result> to_tonlib_api( + const ton::ManualDns::EntryData& entry_data) { + td::Result> res; + if (entry_data.data.empty()) { + return TonlibError::Internal("Unexpected empty EntryData"); + } + entry_data.data.visit(td::overloaded( + [&](const ton::ManualDns::EntryDataText& text) { + res = tonlib_api::make_object(text.text); + }, + [&](const ton::ManualDns::EntryDataNextResolver& resolver) { + res = tonlib_api::make_object( + tonlib_api::make_object(resolver.resolver.rserialize(true))); + }, + [&](const ton::ManualDns::EntryDataAdnlAddress& adnl_address) { + res = tonlib_api::make_object( + tonlib_api::make_object( + td::adnl_id_encode(adnl_address.adnl_address.as_slice()).move_as_ok())); + }, + [&](const ton::ManualDns::EntryDataSmcAddress& smc_address) { + res = tonlib_api::make_object( + tonlib_api::make_object(smc_address.smc_address.rserialize(true))); + })); + return res; +} + +void TonlibClient::finish_dns_resolve(std::string name, td::int32 category, td::int32 ttl, + td::optional block_id, DnsFinishData dns_finish_data, + td::Promise>&& promise) { + block_id = dns_finish_data.block_id; + // TODO: check if the smartcontract supports Dns interface + // TODO: should we use some DnsInterface instead of ManualDns? + auto dns = ton::ManualDns::create(dns_finish_data.smc_state); + TRY_RESULT_PROMISE(promise, entries, dns->resolve(name, category)); + + if (entries.size() == 1 && entries[0].category == -1 && entries[0].name != name && ttl > 0 && + entries[0].data.type == ton::ManualDns::EntryData::Type::NextResolver) { + td::Slice got_name = entries[0].name; + if (got_name.size() >= name.size()) { + TRY_STATUS_PROMISE(promise, TonlibError::Internal("domain is too long")); + } + auto dot_position = name.size() - got_name.size() - 1; + auto suffix = name.substr(dot_position + 1); + auto prefix = name.substr(0, dot_position); + if (name[dot_position] != '.') { + TRY_STATUS_PROMISE(promise, td::Status::Error("next resolver error: domain split not at a component boundary ")); + } + if (suffix != got_name) { + TRY_STATUS_PROMISE(promise, TonlibError::Internal("domain is not a suffix of the query")); + } + + auto address = entries[0].data.data.get().resolver; + return do_dns_request(prefix, category, ttl - 1, std::move(block_id), address, std::move(promise)); + } + + std::vector> api_entries; + for (auto& entry : entries) { + TRY_RESULT_PROMISE(promise, entry_data, to_tonlib_api(entry.data)); + api_entries.push_back( + tonlib_api::make_object(entry.name, entry.category, std::move(entry_data))); + } + promise.set_value(tonlib_api::make_object(std::move(api_entries))); +} + +void TonlibClient::do_dns_request(std::string name, td::int32 category, td::int32 ttl, + td::optional block_id, block::StdAddress address, + td::Promise>&& promise) { + auto block_id_copy = block_id.copy(); + td::Promise new_promise = + promise.send_closure(actor_id(this), &TonlibClient::finish_dns_resolve, name, category, ttl, std::move(block_id)); + + if (0) { + make_request(int_api::GetAccountState{address, std::move(block_id_copy)}, + new_promise.wrap([](auto&& account_state) { + return DnsFinishData{account_state->get_block_id(), account_state->get_smc_state()}; + })); + + return; + } + + TRY_RESULT_PROMISE(promise, args, ton::DnsInterface::resolve_args(name, category)); + int_api::RemoteRunSmcMethod query; + query.address = std::move(address); + query.args = std::move(args); + query.block_id = std::move(block_id_copy); + query.need_result = false; + + make_request(std::move(query), new_promise.wrap([](auto&& run_method) { + return DnsFinishData{run_method.block_id, run_method.smc_state}; + })); + ; +} + +td::Status TonlibClient::do_request(const tonlib_api::dns_resolve& request, + td::Promise>&& promise) { + auto block_id = query_context_.block_id.copy(); + if (!request.account_address_) { + make_request(int_api::GetDnsResolver{}, + promise.send_closure(actor_id(this), &TonlibClient::do_dns_request, request.name_, request.category_, + request.ttl_, std::move(block_id))); + return td::Status::OK(); + } + TRY_RESULT(account_address, get_account_address(request.account_address_->account_address_)); + do_dns_request(request.name_, request.category_, request.ttl_, std::move(block_id), account_address, + std::move(promise)); + return td::Status::OK(); +} + +td::Status TonlibClient::do_request(tonlib_api::sync& request, + td::Promise>&& promise) { + // ton.blockIdExt workchain:int32 shard:int64 seqno:int32 root_hash:bytes file_hash:bytes = ton.BlockIdExt; + client_.with_last_block( + std::move(promise).wrap([](auto last_block) -> td::Result> { + return to_tonlib_api(last_block.last_block_id); + })); return td::Status::OK(); } @@ -2385,6 +3090,28 @@ td::Status TonlibClient::do_request(const tonlib_api::importEncryptedKey& reques promise.set_value(tonlib_api::make_object(key_bytes.serialize(true), std::move(key.secret))); return td::Status::OK(); } +td::Status TonlibClient::do_request(const tonlib_api::exportUnencryptedKey& request, + td::Promise>&& promise) { + if (!request.input_key_) { + return TonlibError::EmptyField("input_key"); + } + TRY_RESULT(input_key, from_tonlib(*request.input_key_)); + TRY_RESULT(exported_key, key_storage_.export_unencrypted_key(std::move(input_key))); + promise.set_value(tonlib_api::make_object(std::move(exported_key.data))); + return td::Status::OK(); +} +td::Status TonlibClient::do_request(const tonlib_api::importUnencryptedKey& request, + td::Promise>&& promise) { + if (!request.exported_unencrypted_key_) { + return TonlibError::EmptyField("exported_encrypted_key"); + } + TRY_RESULT(key, key_storage_.import_unencrypted_key( + std::move(request.local_password_), + KeyStorage::ExportedUnencryptedKey{std::move(request.exported_unencrypted_key_->data_)})); + TRY_RESULT(key_bytes, public_key_from_bytes(key.public_key.as_slice())); + promise.set_value(tonlib_api::make_object(key_bytes.serialize(true), std::move(key.secret))); + return td::Status::OK(); +} td::Status TonlibClient::do_request(const tonlib_api::changeLocalPassword& request, td::Promise>&& promise) { @@ -2507,19 +3234,37 @@ td::Status TonlibClient::do_request(int_api::GetAccountState request, td::Promise>&& promise) { auto actor_id = actor_id_++; actors_[actor_id] = td::actor::create_actor( - "GetAccountState", client_.get_client(), request.address, actor_shared(this, actor_id), + "GetAccountState", client_.get_client(), request.address, std::move(request.block_id), + actor_shared(this, actor_id), promise.wrap([address = request.address, wallet_id = wallet_id_](auto&& state) mutable { return td::make_unique(std::move(address), std::move(state), wallet_id); })); return td::Status::OK(); } +td::Status TonlibClient::do_request(int_api::RemoteRunSmcMethod request, + td::Promise&& promise) { + auto actor_id = actor_id_++; + actors_[actor_id] = td::actor::create_actor( + "RemoteRunSmcMethod", client_.get_client(), std::move(request), actor_shared(this, actor_id), std::move(promise)); + return td::Status::OK(); +} + td::Status TonlibClient::do_request(int_api::GetPrivateKey request, td::Promise&& promise) { TRY_RESULT(pk, key_storage_.load_private_key(std::move(request.input_key))); promise.set_value(std::move(pk)); return td::Status::OK(); } +td::Status TonlibClient::do_request(int_api::GetDnsResolver request, td::Promise&& promise) { + client_.with_last_config(promise.wrap([](auto&& state) mutable -> td::Result { + TRY_RESULT_PREFIX(addr, TRY_VM(state.config->get_dns_root_addr()), + TonlibError::Internal("get dns root addr from config: ")); + return block::StdAddress(ton::masterchainId, addr); + })); + return td::Status::OK(); +} + td::Status TonlibClient::do_request(int_api::SendMessage request, td::Promise&& promise) { client_.send_query(ton::lite_api::liteServer_sendMessage(vm::std_boc_serialize(request.message).move_as_ok()), to_any_promise(std::move(promise))); @@ -2535,33 +3280,31 @@ td::Status TonlibClient::do_request(const tonlib_api::liteServer_getInfo& reques return td::Status::OK(); } +td::Status TonlibClient::do_request(tonlib_api::withBlock& request, + td::Promise>&& promise) { + if (!request.id_) { + return TonlibError::EmptyField("id"); + } + auto to_bits256 = [](td::Slice data, td::Slice name) -> td::Result { + if (data.size() != 32) { + return TonlibError::InvalidField(name, "wrong length (not 32 bytes)"); + } + return td::Bits256(data.ubegin()); + }; + TRY_RESULT(root_hash, to_bits256(request.id_->root_hash_, "root_hash")); + TRY_RESULT(file_hash, to_bits256(request.id_->file_hash_, "file_hash")); + ton::BlockIdExt block_id(request.id_->workchain_, request.id_->shard_, request.id_->seqno_, root_hash, file_hash); + make_any_request(*request.function_, {std::move(block_id)}, std::move(promise)); + return td::Status::OK(); +} + template td::Status TonlibClient::do_request(const tonlib_api::runTests& request, P&&) { UNREACHABLE(); return TonlibError::Internal(); } template -td::Status TonlibClient::do_request(const tonlib_api::raw_getAccountAddress& request, P&&) { - UNREACHABLE(); - return TonlibError::Internal(); -} -template -td::Status TonlibClient::do_request(const tonlib_api::testWallet_getAccountAddress& request, P&&) { - UNREACHABLE(); - return TonlibError::Internal(); -} -template -td::Status TonlibClient::do_request(const tonlib_api::wallet_getAccountAddress& request, P&&) { - UNREACHABLE(); - return TonlibError::Internal(); -} -template -td::Status TonlibClient::do_request(const tonlib_api::wallet_v3_getAccountAddress& request, P&&) { - UNREACHABLE(); - return TonlibError::Internal(); -} -template -td::Status TonlibClient::do_request(const tonlib_api::testGiver_getAccountAddress& request, P&&) { +td::Status TonlibClient::do_request(const tonlib_api::getAccountAddress& request, P&&) { UNREACHABLE(); return TonlibError::Internal(); } @@ -2576,11 +3319,6 @@ td::Status TonlibClient::do_request(const tonlib_api::unpackAccountAddress& requ return TonlibError::Internal(); } template -td::Status TonlibClient::do_request(const tonlib_api::options_validateConfig& request, P&&) { - UNREACHABLE(); - return TonlibError::Internal(); -} -template td::Status TonlibClient::do_request(tonlib_api::getBip39Hints& request, P&&) { UNREACHABLE(); return TonlibError::Internal(); diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h index 68936a4373..786e4e7760 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h +++ b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibClient.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -32,13 +32,19 @@ #include "td/utils/CancellationToken.h" #include "td/utils/optional.h" +#include "smc-envelope/ManualDns.h" + #include namespace tonlib { namespace int_api { struct GetAccountState; struct GetPrivateKey; +struct GetDnsResolver; struct SendMessage; +struct RemoteRunSmcMethod; +struct RemoteRunSmcMethodReturnType; + inline std::string to_string(const int_api::SendMessage&) { return "Send message"; } @@ -46,6 +52,10 @@ inline std::string to_string(const int_api::SendMessage&) { class AccountState; class Query; +td::Result> to_tonlib_api( + const ton::ManualDns::EntryData& entry_data); +td::Result to_dns_entry_data(tonlib_api::dns_EntryData& entry_data); + class TonlibClient : public td::actor::Actor { public: template @@ -58,6 +68,14 @@ class TonlibClient : public td::actor::Actor { ~TonlibClient(); + struct FullConfig { + Config config; + bool use_callbacks_for_network; + LastBlockState last_state; + std::string last_state_key; + td::uint32 wallet_id; + }; + private: enum class State { Uninited, Running, Closed } state_ = State::Uninited; td::unique_ptr callback_; @@ -66,14 +84,17 @@ class TonlibClient : public td::actor::Actor { Config config_; td::uint32 config_generation_{0}; td::uint32 wallet_id_; - std::string blockchain_name_; - bool ignore_cache_{false}; + std::string last_state_key_; bool use_callbacks_for_network_{false}; // KeyStorage std::shared_ptr kv_; KeyStorage key_storage_; LastBlockStorage last_block_storage_; + struct QueryContext { + td::optional block_id; + }; + QueryContext query_context_; // network td::actor::ActorOwn raw_client_; @@ -89,7 +110,7 @@ class TonlibClient : public td::actor::Actor { ExtClientRef get_client_ref(); void init_ext_client(); - void init_last_block(td::optional o_master_config); + void init_last_block(LastBlockState state); void init_last_config(); bool is_closing_{false}; @@ -121,14 +142,9 @@ class TonlibClient : public td::actor::Actor { return tonlib_api::make_object(400, "Function can't be executed synchronously"); } static object_ptr do_static_request(const tonlib_api::runTests& request); - static object_ptr do_static_request(const tonlib_api::raw_getAccountAddress& request); - static object_ptr do_static_request(const tonlib_api::testWallet_getAccountAddress& request); - static object_ptr do_static_request(const tonlib_api::wallet_getAccountAddress& request); - static object_ptr do_static_request(const tonlib_api::wallet_v3_getAccountAddress& request); - static object_ptr do_static_request(const tonlib_api::testGiver_getAccountAddress& request); + static object_ptr do_static_request(const tonlib_api::getAccountAddress& request); static object_ptr do_static_request(const tonlib_api::packAccountAddress& request); static object_ptr do_static_request(const tonlib_api::unpackAccountAddress& request); - static object_ptr do_static_request(tonlib_api::options_validateConfig& request); static object_ptr do_static_request(tonlib_api::getBip39Hints& request); static object_ptr do_static_request(tonlib_api::setLogStream& request); @@ -147,22 +163,12 @@ class TonlibClient : public td::actor::Actor { template td::Status do_request(const tonlib_api::runTests& request, P&&); template - td::Status do_request(const tonlib_api::raw_getAccountAddress& request, P&&); - template - td::Status do_request(const tonlib_api::testWallet_getAccountAddress& request, P&&); - template - td::Status do_request(const tonlib_api::wallet_getAccountAddress& request, P&&); - template - td::Status do_request(const tonlib_api::wallet_v3_getAccountAddress& request, P&&); - template - td::Status do_request(const tonlib_api::testGiver_getAccountAddress& request, P&&); + td::Status do_request(const tonlib_api::getAccountAddress& request, P&&); template td::Status do_request(const tonlib_api::packAccountAddress& request, P&&); template td::Status do_request(const tonlib_api::unpackAccountAddress& request, P&&); template - td::Status do_request(const tonlib_api::options_validateConfig& request, P&&); - template td::Status do_request(tonlib_api::getBip39Hints& request, P&&); template @@ -189,26 +195,26 @@ class TonlibClient : public td::actor::Actor { template td::Status do_request(const tonlib_api::kdf& request, P&&); + void make_any_request(tonlib_api::Function& function, QueryContext query_context, + td::Promise>&& promise); template void make_request(T&& request, P&& promise) { - auto status = do_request(std::forward(request), std::move(promise)); + td::Promise::ReturnType> new_promise = std::move(promise); + + auto status = do_request(std::forward(request), std::move(new_promise)); if (status.is_error()) { - promise.operator()(std::move(status)); + new_promise.operator()(std::move(status)); } } - struct FullConfig { - Config config; - td::optional o_master_config; - bool use_callbacks_for_network; - bool ignore_cache; - td::uint32 wallet_id; - }; - static td::Result validate_config(tonlib_api::object_ptr config); + td::Result validate_config(tonlib_api::object_ptr config); void set_config(FullConfig config); - td::Status do_request(const tonlib_api::init& request, td::Promise>&& promise); + td::Status do_request(const tonlib_api::init& request, td::Promise>&& promise); td::Status do_request(const tonlib_api::close& request, td::Promise>&& promise); - td::Status do_request(tonlib_api::options_setConfig& request, td::Promise>&& promise); + td::Status do_request(tonlib_api::options_validateConfig& request, + td::Promise>&& promise); + td::Status do_request(tonlib_api::options_setConfig& request, + td::Promise>&& promise); td::Status do_request(const tonlib_api::raw_sendMessage& request, td::Promise>&& promise); td::Status do_request(const tonlib_api::raw_createAndSendMessage& request, @@ -217,33 +223,16 @@ class TonlibClient : public td::actor::Actor { td::Promise>&& promise); td::Status do_request(tonlib_api::raw_getAccountState& request, - td::Promise>&& promise); + td::Promise>&& promise); td::Status do_request(tonlib_api::raw_getTransactions& request, td::Promise>&& promise); - td::Status do_request(const tonlib_api::testWallet_init& request, td::Promise>&& promise); - td::Status do_request(const tonlib_api::testWallet_sendGrams& request, - td::Promise>&& promise); - td::Status do_request(tonlib_api::testWallet_getAccountState& request, - td::Promise>&& promise); + td::Status do_request(const tonlib_api::getAccountState& request, + td::Promise>&& promise); + td::Status do_request(const tonlib_api::guessAccountRevision& request, + td::Promise>&& promise); - td::Status do_request(const tonlib_api::wallet_init& request, td::Promise>&& promise); - td::Status do_request(const tonlib_api::wallet_sendGrams& request, - td::Promise>&& promise); - td::Status do_request(tonlib_api::wallet_getAccountState& request, - td::Promise>&& promise); - - td::Status do_request(const tonlib_api::testGiver_getAccountState& request, - td::Promise>&& promise); - td::Status do_request(const tonlib_api::testGiver_sendGrams& request, - td::Promise>&& promise); - - td::Status do_request(const tonlib_api::generic_getAccountState& request, - td::Promise>&& promise); - td::Status do_request(tonlib_api::generic_sendGrams& request, - td::Promise>&& promise); - - td::Status do_request(tonlib_api::sync& request, td::Promise>&& promise); + td::Status do_request(tonlib_api::sync& request, td::Promise>&& promise); td::Status do_request(const tonlib_api::createNewKey& request, td::Promise>&& promise); td::Status do_request(const tonlib_api::exportKey& request, @@ -261,6 +250,11 @@ class TonlibClient : public td::actor::Actor { td::Status do_request(const tonlib_api::importEncryptedKey& request, td::Promise>&& promise); + td::Status do_request(const tonlib_api::exportUnencryptedKey& request, + td::Promise>&& promise); + td::Status do_request(const tonlib_api::importUnencryptedKey& request, + td::Promise>&& promise); + td::Status do_request(const tonlib_api::changeLocalPassword& request, td::Promise>&& promise); @@ -275,8 +269,6 @@ class TonlibClient : public td::actor::Actor { td::Result> get_query_info(td::int64 id); void finish_create_query(td::Result> r_query, td::Promise>&& promise); - void finish_send_query(td::Result> r_query, - td::Promise>&& promise); void query_estimate_fees(td::int64 id, bool ignore_chksig, td::Result r_state, td::Promise>&& promise); @@ -287,8 +279,9 @@ class TonlibClient : public td::actor::Actor { td::Status do_request(const tonlib_api::query_send& request, td::Promise>&& promise); td::Status do_request(tonlib_api::query_forget& request, td::Promise>&& promise); - td::Status do_request(tonlib_api::generic_createSendGramsQuery& request, - td::Promise>&& promise); + td::Status do_request(tonlib_api::createQuery& request, td::Promise>&& promise); + + td::Status do_request(tonlib_api::msg_decrypt& request, td::Promise>&& promise); td::int64 next_smc_id_{0}; std::map> smcs_; @@ -307,13 +300,29 @@ class TonlibClient : public td::actor::Actor { td::Status do_request(const tonlib_api::smc_runGetMethod& request, td::Promise>&& promise); + td::Status do_request(const tonlib_api::dns_resolve& request, + td::Promise>&& promise); + void do_dns_request(std::string name, td::int32 category, td::int32 ttl, td::optional block_id, + block::StdAddress address, td::Promise>&& promise); + struct DnsFinishData { + ton::BlockIdExt block_id; + ton::SmartContract::State smc_state; + }; + void finish_dns_resolve(std::string name, td::int32 category, td::int32 ttl, td::optional block_id, + DnsFinishData dns_finish_data, td::Promise>&& promise); + td::Status do_request(int_api::GetAccountState request, td::Promise>&&); td::Status do_request(int_api::GetPrivateKey request, td::Promise&&); + td::Status do_request(int_api::GetDnsResolver request, td::Promise&&); + td::Status do_request(int_api::RemoteRunSmcMethod request, + td::Promise&& promise); td::Status do_request(int_api::SendMessage request, td::Promise&& promise); td::Status do_request(const tonlib_api::liteServer_getInfo& request, td::Promise>&& promise); + td::Status do_request(tonlib_api::withBlock& request, td::Promise>&& promise); + void proxy_request(td::int64 query_id, std::string data); friend class TonlibQueryActor; diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h index dca5eecfcb..a1d98fb3bb 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h +++ b/submodules/ton/tonlib-src/tonlib/tonlib/TonlibError.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once @@ -32,6 +32,7 @@ // INVALID_ACCOUNT_ADDRESS // INVALID_CONFIG // INVALID_PEM_KEY +// INVALID_REVISION // MESSAGE_TOO_LONG // EMPTY_FIELD // INVALID_FIELD @@ -39,6 +40,7 @@ // ACCOUNT_NOT_INITED // ACCOUNT_TYPE_UNKNOWN // ACCOUNT_TYPE_UNEXPECTED +// ACCOUNT_ACTION_UNSUPPORTED // VALIDATE_ACCOUNT_STATE // VALIDATE_TRANSACTION // VALIDATE_ZERO_STATE @@ -79,6 +81,9 @@ struct TonlibError { static td::Status InvalidPemKey() { return td::Status::Error(400, "INVALID_PEM_KEY"); } + static td::Status InvalidRevision() { + return td::Status::Error(400, "INVALID_REVISION"); + } static td::Status NeedConfig() { return td::Status::Error(400, "NeedConfig"); } @@ -86,7 +91,7 @@ struct TonlibError { return td::Status::Error(400, "MESSAGE_TOO_LONG"); } static td::Status EmptyField(td::Slice field_name) { - return td::Status::Error(400, PSLICE() << "EMPTY_FIELD: Field " << field_name << " must not be emtpy"); + return td::Status::Error(400, PSLICE() << "EMPTY_FIELD: Field " << field_name << " must not be empty"); } static td::Status InvalidField(td::Slice field_name, td::Slice reason) { return td::Status::Error(400, PSLICE() << "INVALID_FIELD: Field " << field_name << " has invalid value " << reason); @@ -94,6 +99,9 @@ struct TonlibError { static td::Status DangerousTransaction(td::Slice reason) { return td::Status::Error(400, PSLICE() << "DANGEROUS_TRANSACTION: " << reason); } + static td::Status MessageEncryption(td::Slice reason) { + return td::Status::Error(400, PSLICE() << "MESSAGE_ENCRYPTION: " << reason); + } static td::Status AccountNotInited() { return td::Status::Error(400, "ACCOUNT_NOT_INITED"); } @@ -103,6 +111,9 @@ struct TonlibError { static td::Status AccountTypeUnexpected(td::Slice expected) { return td::Status::Error(400, PSLICE() << "ACCOUNT_TYPE_UNEXPECTED: not a " << expected); } + static td::Status AccountActionUnsupported(td::Slice action) { + return td::Status::Error(400, PSLICE() << "ACCOUNT_ACTION_UNSUPPORTED: " << action); + } static td::Status Internal() { return td::Status::Error(500, "INTERNAL"); } diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp index 586070b090..456abf9968 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp +++ b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #include "SimpleEncryption.h" @@ -36,8 +36,9 @@ td::AesCbcState SimpleEncryption::calc_aes_cbc_state_sha512(td::Slice seed) { sha512(seed, hash.as_mutable_slice()); return calc_aes_cbc_state_hash(hash.as_slice()); } -td::SecureString SimpleEncryption::gen_random_prefix(td::int64 data_size) { - td::SecureString buff(td::narrow_cast(((32 + 15 + data_size) & -16) - data_size), 0); + +td::SecureString SimpleEncryption::gen_random_prefix(td::int64 data_size, td::int64 min_padding) { + td::SecureString buff(td::narrow_cast(((min_padding + 15 + data_size) & -16) - data_size), 0); td::Random::secure_bytes(buff.as_mutable_slice()); buff.as_mutable_slice()[0] = td::narrow_cast(buff.size()); CHECK((buff.size() + data_size) % 16 == 0); @@ -71,7 +72,7 @@ td::SecureString SimpleEncryption::encrypt_data_with_prefix(td::Slice data, td:: } td::SecureString SimpleEncryption::encrypt_data(td::Slice data, td::Slice secret) { - auto prefix = gen_random_prefix(data.size()); + auto prefix = gen_random_prefix(data.size(), 32); td::SecureString combined(prefix.size() + data.size()); combined.as_mutable_slice().copy_from(prefix); combined.as_mutable_slice().substr(prefix.size()).copy_from(data); @@ -104,4 +105,96 @@ td::Result SimpleEncryption::decrypt_data(td::Slice encrypted_ return td::SecureString(decrypted_data.as_slice().substr(prefix_size)); } + +td::Result SimpleEncryptionV2::encrypt_data(td::Slice data, + const td::Ed25519::PublicKey &public_key) { + TRY_RESULT(tmp_private_key, td::Ed25519::generate_private_key()); + return encrypt_data(data, public_key, tmp_private_key); +} + +namespace { +td::SecureString secure_xor(td::Slice a, td::Slice b) { + CHECK(a.size() == b.size()); + td::SecureString res(a.size()); + for (size_t i = 0; i < res.size(); i++) { + res.as_mutable_slice()[i] = a[i] ^ b[i]; + } + return res; +} +} // namespace + +td::Result SimpleEncryptionV2::encrypt_data(td::Slice data, const td::Ed25519::PublicKey &public_key, + const td::Ed25519::PrivateKey &private_key) { + TRY_RESULT(shared_secret, td::Ed25519::compute_shared_secret(public_key, private_key)); + auto encrypted = encrypt_data(data, shared_secret.as_slice()); + TRY_RESULT(tmp_public_key, private_key.get_public_key()); + td::SecureString prefixed_encrypted(tmp_public_key.LENGTH + encrypted.size()); + prefixed_encrypted.as_mutable_slice().copy_from(tmp_public_key.as_octet_string()); + auto xored_keys = secure_xor(public_key.as_octet_string().as_slice(), tmp_public_key.as_octet_string().as_slice()); + prefixed_encrypted.as_mutable_slice().copy_from(xored_keys.as_slice()); + prefixed_encrypted.as_mutable_slice().substr(xored_keys.size()).copy_from(encrypted); + return std::move(prefixed_encrypted); +} + +td::Result SimpleEncryptionV2::decrypt_data(td::Slice data, + const td::Ed25519::PrivateKey &private_key) { + if (data.size() < td::Ed25519::PublicKey::LENGTH) { + return td::Status::Error("Failed to decrypte: data is too small"); + } + TRY_RESULT(public_key, private_key.get_public_key()); + auto tmp_public_key = + td::Ed25519::PublicKey(secure_xor(data.substr(0, td::Ed25519::PublicKey::LENGTH), public_key.as_octet_string())); + TRY_RESULT(shared_secret, td::Ed25519::compute_shared_secret(tmp_public_key, private_key)); + TRY_RESULT(decrypted, decrypt_data(data.substr(td::Ed25519::PublicKey::LENGTH), shared_secret.as_slice())); + return std::move(decrypted); +} +td::SecureString SimpleEncryptionV2::encrypt_data(td::Slice data, td::Slice secret) { + auto prefix = SimpleEncryption::gen_random_prefix(data.size(), 16); + td::SecureString combined(prefix.size() + data.size()); + combined.as_mutable_slice().copy_from(prefix); + combined.as_mutable_slice().substr(prefix.size()).copy_from(data); + return encrypt_data_with_prefix(combined.as_slice(), secret); +} +td::Result SimpleEncryptionV2::decrypt_data(td::Slice encrypted_data, td::Slice secret) { + if (encrypted_data.size() < 17) { + return td::Status::Error("Failed to decrypt: data is too small"); + } + if (encrypted_data.size() % 16 != 0) { + return td::Status::Error("Failed to decrypt: data size is not divisible by 16"); + } + auto msg_key = encrypted_data.substr(0, 16); + encrypted_data = encrypted_data.substr(16); + + auto cbc_state = SimpleEncryption::calc_aes_cbc_state_hash(SimpleEncryption::combine_secrets(secret, msg_key)); + td::SecureString decrypted_data(encrypted_data.size(), 0); + cbc_state.decrypt(encrypted_data, decrypted_data.as_mutable_slice()); + + auto data_hash = SimpleEncryption::combine_secrets(decrypted_data, secret); + auto got_msg_key = data_hash.as_slice().substr(0, 16); + // check hash + if (msg_key != got_msg_key) { + return td::Status::Error("Failed to decrypt: hash mismatch"); + } + + td::uint8 prefix_size = static_cast(decrypted_data[0]); + if (prefix_size > decrypted_data.size() || prefix_size < 16) { + return td::Status::Error("Failed to decrypt: invalid prefix size"); + } + + return td::SecureString(decrypted_data.as_slice().substr(prefix_size)); +} +td::SecureString SimpleEncryptionV2::encrypt_data_with_prefix(td::Slice data, td::Slice secret) { + CHECK(data.size() % 16 == 0); + auto data_hash = SimpleEncryption::combine_secrets(data, secret); + auto msg_key = data_hash.as_slice().substr(0, 16); + + td::SecureString res_buf(data.size() + 16, 0); + auto res = res_buf.as_mutable_slice(); + res.copy_from(msg_key); + + auto cbc_state = SimpleEncryption::calc_aes_cbc_state_hash(SimpleEncryption::combine_secrets(secret, msg_key)); + cbc_state.encrypt(data, res.substr(16)); + + return res_buf; +} } // namespace tonlib diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h index 69d5629a72..d170c26bce 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h +++ b/submodules/ton/tonlib-src/tonlib/tonlib/keys/SimpleEncryption.h @@ -14,13 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with TON Blockchain Library. If not, see . - Copyright 2017-2019 Telegram Systems LLP + Copyright 2017-2020 Telegram Systems LLP */ #pragma once #include "td/utils/crypto.h" #include "td/utils/Slice.h" #include "td/utils/SharedSlice.h" +#include "crypto/Ed25519.h" namespace tonlib { class SimpleEncryption { @@ -33,8 +34,23 @@ class SimpleEncryption { private: static td::AesCbcState calc_aes_cbc_state_hash(td::Slice hash); static td::AesCbcState calc_aes_cbc_state_sha512(td::Slice seed); - static td::SecureString gen_random_prefix(td::int64 data_size); + static td::SecureString gen_random_prefix(td::int64 data_size, td::int64 min_padding); static td::SecureString encrypt_data_with_prefix(td::Slice data, td::Slice secret); + + friend class SimpleEncryptionV2; +}; + +class SimpleEncryptionV2 { + public: + static td::Result encrypt_data(td::Slice data, const td::Ed25519::PublicKey &public_key); + static td::Result decrypt_data(td::Slice data, const td::Ed25519::PrivateKey &private_key); + static td::Result encrypt_data(td::Slice data, const td::Ed25519::PublicKey &public_key, + const td::Ed25519::PrivateKey &private_key); + static td::SecureString encrypt_data(td::Slice data, td::Slice secret); + static td::Result decrypt_data(td::Slice encrypted_data, td::Slice secret); + + private: + static td::SecureString encrypt_data_with_prefix(td::Slice data, td::Slice secret); }; } // namespace tonlib diff --git a/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp b/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp index 716fae3070..2f37df6851 100644 --- a/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp +++ b/submodules/ton/tonlib-src/tonlib/tonlib/tonlib-cli.cpp @@ -1,7 +1,35 @@ +/* + This file is part of TON Blockchain source code. + + TON Blockchain is free software; you can redistribute it and/or + modify it under the terms of the GNU 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 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with TON Blockchain. If not, see . + + In addition, as a special exception, the copyright holders give permission + to link the code of portions of this program with the OpenSSL library. + You must obey the GNU General Public License in all respects for all + of the code used other than OpenSSL. If you modify file(s) with this + exception, you may extend this exception to your version of the file(s), + but you are not obligated to do so. If you do not wish to do so, delete this + exception statement from your version. If you delete this exception statement + from all source files in the program, then also delete it here. + + Copyright 2019-2020 Telegram Systems LLP +*/ #include "td/actor/actor.h" #include "td/utils/filesystem.h" #include "td/utils/OptionsParser.h" +#include "td/utils/overloaded.h" #include "td/utils/Parser.h" #include "td/utils/port/signals.h" #include "td/utils/port/path.h" @@ -15,62 +43,65 @@ #include "tonlib/ExtClientLazy.h" +#include "smc-envelope/ManualDns.h" + #include "auto/tl/tonlib_api.hpp" +#include #include #include -// Consider this as a TODO list: -// -// (from lite-client) -// SUPPORTED -// "time\tGet server time\n" -// "remote-version\tShows server time, version and capabilities\n" -// "help []\tThis help\n" // TODO: support [] -// "quit\tExit\n"; -// "sendfile \tLoad a serialized message from and send it to server\n" -// "saveaccount[code|data] []\tSaves into specified file the most recent state " -// "(StateInit) or just the code or data of specified account; is in " -// "[:] format\n" -// -// "runmethod ...\tRuns GET method of account " -// "with specified parameters\n" -// -// "getaccount []\tLoads the most recent state of specified account; is in " -// "[:] format\n" -// -// WONTSUPPORT -// -// UNSUPPORTED -//"last\tGet last block and state info from server\n" -//"status\tShow connection and local database status\n" -//"allshards []\tShows shard configuration from the most recent masterchain " -//"state or from masterchain state corresponding to \n" -//"getconfig [...]\tShows specified or all configuration parameters from the latest masterchain state\n" -//"getconfigfrom [...]\tShows specified or all configuration parameters from the " -//"masterchain state of \n" -//"saveconfig []\tSaves all configuration parameters into specified file\n" -//"gethead \tShows block header for \n" -//"getblock \tDownloads block\n" -//"dumpblock \tDownloads and dumps specified block\n" -//"getstate \tDownloads state corresponding to specified block\n" -//"dumpstate \tDownloads and dumps state corresponding to specified block\n" -//"dumptrans \tDumps one transaction of specified account\n" -//"lasttrans[dump] []\tShows or dumps specified transaction and " -//"several preceding " -//"ones\n" -//"listblocktrans[rev] [ ]\tLists block transactions, " -//"starting immediately after or before the specified one\n" -//"blkproofchain[step] []\tDownloads and checks proof of validity of the /"second " -//"indicated block (or the last known masterchain block) starting from given block\n" -//"byseqno \tLooks up a block by workchain, shard and seqno, and shows its " -//"header\n" -//"bylt \tLooks up a block by workchain, shard and logical time, and shows its " -//"header\n" -//"byutime \tLooks up a block by workchain, shard and creation time, and " -//"shows its header\n" -//"known\tShows the list of all known block ids\n" -//"privkey \tLoads a private key from file\n" +// GR$ +struct Grams { + td::uint64 nano; +}; + +td::StringBuilder& operator<<(td::StringBuilder& sb, const Grams& grams) { + auto b = grams.nano % 1000000000; + auto a = grams.nano / 1000000000; + sb << "GR$" << a; + if (b != 0) { + size_t sz = 9; + while (b % 10 == 0) { + sz--; + b /= 10; + } + sb << '.'; + [&](auto b_str) { + for (size_t i = b_str.size(); i < sz; i++) { + sb << '0'; + } + sb << b_str; + }(PSLICE() << b); + } + return sb; +} + +td::Result parse_grams(td::Slice grams) { + td::ConstParser parser(grams); + if (parser.skip_start_with("GR$")) { + TRY_RESULT(a, td::to_integer_safe(parser.read_till_nofail('.'))); + td::uint64 res = a; + if (parser.try_skip('.')) { + for (int i = 0; i < 9; i++) { + res *= 10; + if (parser.peek_char() >= '0' && parser.peek_char() <= '9') { + res += parser.peek_char() - '0'; + parser.advance(1); + } + } + } else { + res *= 1000000000; + } + if (!parser.empty()) { + return td::Status::Error(PSLICE() << "Failed to parse grams \"" << grams << "\", left \"" << parser.read_all() + << "\""); + } + return Grams{res}; + } + TRY_RESULT(value, td::to_integer_safe(grams)); + return Grams{value}; +} class TonlibCli : public td::actor::Actor { public: @@ -82,6 +113,8 @@ class TonlibCli : public td::actor::Actor { bool in_memory{false}; bool use_callbacks_for_network{false}; td::int32 wallet_version = 2; + td::int32 wallet_revision = 0; + td::optional wallet_id; bool ignore_cache{false}; bool one_shot{false}; @@ -97,6 +130,8 @@ class TonlibCli : public td::actor::Actor { std::uint64_t next_query_id_{1}; td::Promise cont_; td::uint32 wallet_id_; + ton::tonlib_api::object_ptr current_block_; + enum class BlockMode { Auto, Manual } block_mode_ = BlockMode::Auto; struct KeyInfo { std::string public_key; @@ -177,10 +212,6 @@ class TonlibCli : public td::actor::Actor { ? make_object(options_.config, options_.name, options_.use_callbacks_for_network, options_.ignore_cache) : nullptr; - auto config2 = !options_.config.empty() - ? make_object(options_.config, options_.name, - options_.use_callbacks_for_network, options_.ignore_cache) - : nullptr; tonlib_api::object_ptr ks_type; if (options_.in_memory) { @@ -188,22 +219,23 @@ class TonlibCli : public td::actor::Actor { } else { ks_type = make_object(options_.key_dir); } - auto obj = - tonlib::TonlibClient::static_request(make_object(std::move(config2))); - if (obj->get_id() != tonlib_api::error::ID) { - auto info = ton::move_tl_object_as(obj); - wallet_id_ = static_cast(info->default_wallet_id_); - } else { - LOG(ERROR) << "Invalid config"; - } send_query(make_object(make_object(std::move(config), std::move(ks_type))), - [](auto r_ok) { + [&](auto r_ok) { LOG_IF(ERROR, r_ok.is_error()) << r_ok.error(); - td::TerminalIO::out() << "Tonlib is inited\n"; + if (r_ok.is_ok()) { + if (r_ok.ok()->config_info_) { + if (options_.wallet_id) { + wallet_id_ = options_.wallet_id.value(); + } else { + wallet_id_ = static_cast(r_ok.ok()->config_info_->default_wallet_id_); + } + } + td::TerminalIO::out() << "Tonlib is inited\n"; + if (options_.one_shot) { + td::actor::send_closure(actor_id(this), &TonlibCli::parse_line, td::BufferSlice(options_.cmd)); + } + } }); - if (options_.one_shot) { - td::actor::send_closure(actor_id(this), &TonlibCli::parse_line, td::BufferSlice(options_.cmd)); - } } void hangup_shared() override { @@ -230,19 +262,6 @@ class TonlibCli : public td::actor::Actor { } } - void on_error() { - if (options_.one_shot) { - LOG(ERROR) << "FAILED"; - std::_Exit(1); - } - } - void on_ok() { - if (options_.one_shot) { - LOG(INFO) << "OK"; - std::_Exit(0); - } - } - void parse_line(td::BufferSlice line) { if (is_closing_) { return; @@ -267,11 +286,18 @@ class TonlibCli : public td::actor::Actor { return true; }; - td::Promise cmd_promise = [line = line.clone()](td::Result res) { + td::Promise cmd_promise = [line = line.clone(), one_shot = options_.one_shot](td::Result res) { if (res.is_ok()) { - // on_ok + if (one_shot) { + LOG(DEBUG) << "OK"; + std::_Exit(0); + } } else { td::TerminalIO::out() << "Query {" << line.as_slice() << "} FAILED: \n\t" << res.error() << "\n"; + if (one_shot) { + LOG(ERROR) << "FAILED"; + std::_Exit(1); + } } }; @@ -282,6 +308,25 @@ class TonlibCli : public td::actor::Actor { td::TerminalIO::out() << "sendfile \tLoad a serialized message from and send it to server\n"; td::TerminalIO::out() << "setconfig|validateconfig [] [] [] - set or validate " "lite server config\n"; + td::TerminalIO::out() << "runmethod ...\tRuns GET method of account " + " with specified parameters\n"; + td::TerminalIO::out() << "getstate \tget state of wallet with requested key\n"; + td::TerminalIO::out() << "guessrevision \tsearch of existing accounts corresponding to the given key\n"; + td::TerminalIO::out() << "getaddress \tget address of wallet with requested key\n"; + td::TerminalIO::out() << "dns resolve ( | root) \n"; + td::TerminalIO::out() << "dns cmd \n"; + //td::TerminalIO::out() << "dns cmdlist {\\n} end\n"; + td::TerminalIO::out() << "dns cmdfile \n"; + td::TerminalIO::out() << "\t = set | delete.name | delete.all\n"; + td::TerminalIO::out() << "\t = DELETED | EMPTY | TEXT: | NEXT: | SMC: | " + "ADNL:\n"; + + td::TerminalIO::out() + << "blockmode auto|manual\tWith auto mode, all queries will be executed with respect to the latest block. " + "With manual mode, user must update current block explicitly: with last or setblock\n"; + td::TerminalIO::out() << "last\tUpdate current block to the most recent one\n"; + td::TerminalIO::out() << "setblock \tSet current block\n"; + td::TerminalIO::out() << "exit\tExit\n"; td::TerminalIO::out() << "quit\tExit\n"; td::TerminalIO::out() @@ -292,17 +337,22 @@ class TonlibCli : public td::actor::Actor { td::TerminalIO::out() << "unpackaddress
- validate and parse address\n"; td::TerminalIO::out() << "setbounceble
[] - change bounceble flag in address\n"; td::TerminalIO::out() << "importkey - import key\n"; + td::TerminalIO::out() << "importkeypem - import key\n"; + td::TerminalIO::out() << "importkeyraw - import key\n"; td::TerminalIO::out() << "deletekeys - delete ALL PRIVATE KEYS\n"; td::TerminalIO::out() << "exportkey [] - export key\n"; td::TerminalIO::out() << "exportkeypem [] - export key\n"; - td::TerminalIO::out() << "getstate - get state of simple wallet with requested key\n"; td::TerminalIO::out() << "gethistory - get history fo simple wallet with requested key (last 10 transactions)\n"; td::TerminalIO::out() << "init - init simple wallet with requested key\n"; - td::TerminalIO::out() << "transfer[f] - transfer of grams from " - " to .\n" - << "\t could also be 'giver'\n" - << "\t could also be 'giver' or smartcontract address\n"; + td::TerminalIO::out() << "transfer[f][F][e][k][c] ( |) - " + "make transfer from \n" + << "\t 'f' modifier - allow send to uninited account\n" + << "\t 'F' modifier - read list of messages from (in same format " + " , one per line)\n" + << "\t 'e' modifier - encrypt all messages\n" + << "\t 'k' modifier - use fake key\n" + << "\t 'c' modifier - just esmitate fees\n"; } else if (cmd == "genkey") { generate_key(); } else if (cmd == "exit" || cmd == "quit") { @@ -320,18 +370,6 @@ class TonlibCli : public td::actor::Actor { export_key(cmd.str(), parser.read_word()); } else if (cmd == "importkey") { import_key(parser.read_all()); - } else if (cmd == "getstate") { - get_state(parser.read_word()); - } else if (cmd == "gethistory") { - get_history(parser.read_word()); - } else if (cmd == "init") { - init_simple_wallet(parser.read_word()); - } else if (cmd == "transfer" || cmd == "transferf") { - auto from = parser.read_word(); - auto to = parser.read_word(); - auto grams = parser.read_word(); - auto message = parser.read_word(); - transfer(from, to, grams, message, cmd == "transferf"); } else if (cmd == "hint") { get_hints(parser.read_word()); } else if (cmd == "unpackaddress") { @@ -343,8 +381,10 @@ class TonlibCli : public td::actor::Actor { } else if (cmd == "netstats") { dump_netstats(); // reviewed from here - } else if (cmd == "sync") { - sync(std::move(cmd_promise)); + } else if (cmd == "blockmode") { + set_block_mode(parser.read_word(), std::move(cmd_promise)); + } else if (cmd == "sync" || cmd == "last") { + sync(std::move(cmd_promise), cmd == "last"); } else if (cmd == "time") { remote_time(std::move(cmd_promise)); } else if (cmd == "remote-version") { @@ -363,6 +403,26 @@ class TonlibCli : public td::actor::Actor { auto use_callback = parser.read_word(); auto force = parser.read_word(); set_validate_config(cmd, config, name, to_bool(use_callback), to_bool(force), std::move(cmd_promise)); + } else if (td::begins_with(cmd, "transfer") || cmd == "init") { + // transfer[f][F] + // f - force + // F from file - SEND
+ // use @empty for empty message + transfer(parser, cmd, std::move(cmd_promise)); + } else if (cmd == "getstate") { + get_state(parser.read_word(), std::move(cmd_promise)); + } else if (cmd == "getaddress") { + get_address(parser.read_word(), std::move(cmd_promise)); + } else if (cmd == "importkeypem") { + import_key_pem(parser.read_word(), std::move(cmd_promise)); + } else if (cmd == "importkeyraw") { + import_key_raw(parser.read_word(), std::move(cmd_promise)); + } else if (cmd == "dns") { + run_dns_cmd(parser, std::move(cmd_promise)); + } else if (cmd == "gethistory") { + get_history(parser.read_word(), std::move(cmd_promise)); + } else if (cmd == "guessrevision") { + guess_revision(parser.read_word(), std::move(cmd_promise)); } else { cmd_promise.set_error(td::Status::Error(PSLICE() << "Unkwnown query `" << cmd << "`")); } @@ -371,6 +431,109 @@ class TonlibCli : public td::actor::Actor { } } + void run_dns_cmd(td::ConstParser& parser, td::Promise promise) { + auto cmd = parser.read_word(); + if (cmd == "cmd" || cmd == "cmdlist" || cmd == "cmdfile") { + return dns_cmd(cmd, parser, std::move(promise)); + } + if (cmd == "resolve") { + return dns_resolve(parser, std::move(promise)); + } + promise.set_error(td::Status::Error("Unknown cmd")); + } + + void do_dns_resolve(std::string name, td::int16 category, td::int32 ttl, + tonlib_api::object_ptr resolved, td::Promise promise) { + if (resolved->entries_.empty()) { + td::TerminalIO::out() << "No dns entries found\n"; + promise.set_value(td::Unit()); + return; + } + if (resolved->entries_[0]->entry_->get_id() == tonlib_api::dns_entryDataNextResolver::ID && ttl != 0) { + td::TerminalIO::out() << "Redirect resolver\n"; + auto entry = tonlib_api::move_object_as(resolved->entries_[0]->entry_); + send_query(tonlib_api::make_object(std::move(entry->resolver_), name, category, ttl), + promise.send_closure(actor_id(this), &TonlibCli::do_dns_resolve, name, category, 0)); + return; + } + td::TerminalIO::out() << "Done\n"; + for (auto& entry : resolved->entries_) { + td::TerminalIO::out() << " " << entry->name_ << " " << entry->category_ << " " + << tonlib::to_dns_entry_data(*entry->entry_).move_as_ok() << "\n"; + } + promise.set_value(td::Unit()); + } + + void dns_resolve(td::ConstParser& parser, td::Promise promise) { + auto key_id = parser.read_word(); + if (key_id == "root") { + key_id = "none"; + } + TRY_RESULT_PROMISE(promise, address, to_account_address(key_id, false)); + auto name = parser.read_word(); + auto category_str = parser.read_word(); + TRY_RESULT_PROMISE(promise, category, td::to_integer_safe(category_str)); + + std::vector> entries; + entries.push_back(tonlib_api::make_object( + "", -1, tonlib_api::make_object(std::move(address.address)))); + do_dns_resolve(name.str(), category, 10, tonlib_api::make_object(std::move(entries)), + std::move(promise)); + } + void dns_cmd(td::Slice cmd, td::ConstParser& parser, td::Promise promise) { + auto key_id = parser.read_word(); + TRY_RESULT_PROMISE(promise, address, to_account_address(key_id, true)); + + std::vector actions_ext; + if (cmd == "cmd") { + TRY_RESULT_PROMISE_ASSIGN(promise, actions_ext, ton::ManualDns::parse(parser.read_all())); + } else if (cmd == "cmdfile") { + TRY_RESULT_PROMISE(promise, file_data, td::read_file(parser.read_word().str())); + TRY_RESULT_PROMISE_ASSIGN(promise, actions_ext, ton::ManualDns::parse(file_data)); + } + + std::vector> actions; + for (auto& action : actions_ext) { + if (action.name.empty()) { + actions.push_back(tonlib_api::make_object()); + td::TerminalIO::out() << "Delete all dns entries\n"; + } else if (action.category == 0) { + actions.push_back(tonlib_api::make_object(action.name, 0)); + td::TerminalIO::out() << "Delete all dns enties with name: " << action.name << "\n"; + } else if (!action.data) { + actions.push_back(tonlib_api::make_object(action.name, action.category)); + td::TerminalIO::out() << "Delete all dns enties with name and category: " << action.name << ":" + << action.category << "\n"; + } else { + td::StringBuilder sb; + + td::Status error; + if (action.data.value().data.empty()) { + TRY_STATUS_PROMISE(promise, td::Status::Error("Empty entry data is not supported")); + } + TRY_RESULT_PROMISE(promise, data, tonlib::to_tonlib_api(action.data.value())); + sb << action.data.value(); + TRY_STATUS_PROMISE(promise, std::move(error)); + td::TerminalIO::out() << "Set dns entry: " << action.name << ":" << action.category << " " << sb.as_cslice() + << "\n"; + actions.push_back(tonlib_api::make_object( + tonlib_api::make_object(action.name, action.category, std::move(data)))); + } + } + + auto action = tonlib_api::make_object(std::move(actions)); + + td::Slice password; // empty by default + using tonlib_api::make_object; + auto key = !address.secret.empty() ? make_object( + make_object(address.public_key, address.secret.copy()), + td::SecureString(password)) + : nullptr; + send_query(tonlib_api::make_object(std::move(key), std::move(address.address), 60, + std::move(action)), + promise.send_closure(actor_id(this), &TonlibCli::transfer2, false)); + } + void remote_time(td::Promise promise) { send_query(tonlib_api::make_object(), promise.wrap([](auto&& info) { td::TerminalIO::out() << "Lite server time is: " << info->now_ << "\n"; @@ -429,13 +592,29 @@ class TonlibCli : public td::actor::Actor { promise.set_value(td::Unit()); } - void sync(td::Promise promise) { + void sync(td::Promise promise, bool update_last) { using tonlib_api::make_object; - send_query(make_object(), promise.wrap([](auto&&) { + send_query(make_object(), promise.wrap([&, update_last](auto&& block) { td::TerminalIO::out() << "synchronized\n"; + td::TerminalIO::out() << to_string(block) << "\n"; + if (update_last) { + current_block_ = std::move(block); + td::TerminalIO::out() << "Update current block\n"; + } return td::Unit(); })); } + void set_block_mode(td::Slice mode, td::Promise promise) { + if (mode == "auto") { + block_mode_ = BlockMode::Auto; + promise.set_value(td::Unit()); + } else if (mode == "manual") { + block_mode_ = BlockMode::Manual; + promise.set_value(td::Unit()); + } else { + promise.set_error(td::Status::Error("Invalid block mode")); + } + } td::Result> parse_stack_entry(td::Slice str) { if (str.empty() || str.size() > 65535) { return td::Status::Error("String is or empty or too big"); @@ -482,6 +661,73 @@ class TonlibCli : public td::actor::Actor { tonlib_api::make_object(dec_string(num))); } + td::Result>> parse_stack(td::ConstParser& parser, + td::Slice end_token) { + std::vector> stack; + while (true) { + auto word = parser.read_word(); + LOG(ERROR) << word << " vs " << end_token; + if (word == end_token) { + break; + } + if (word == "[") { + TRY_RESULT(elements, parse_stack(parser, "]")); + stack.push_back(tonlib_api::make_object( + tonlib_api::make_object(std::move(elements)))); + } else if (word == "(") { + TRY_RESULT(elements, parse_stack(parser, ")")); + stack.push_back(tonlib_api::make_object( + tonlib_api::make_object(std::move(elements)))); + } else { + TRY_RESULT(stack_entry, parse_stack_entry(word)); + stack.push_back(std::move(stack_entry)); + } + } + return std::move(stack); + } + + static void store_entry(td::StringBuilder& sb, tonlib_api::tvm_StackEntry& entry) { + downcast_call(entry, td::overloaded( + [&](tonlib_api::tvm_stackEntryCell& cell) { + auto r_cell = vm::std_boc_deserialize(cell.cell_->bytes_); + if (r_cell.is_error()) { + sb << ""; + } + auto cs = vm::load_cell_slice(r_cell.move_as_ok()); + std::stringstream ss; + cs.print_rec(ss); + sb << ss.str(); + }, + [&](tonlib_api::tvm_stackEntrySlice& cell) { + auto r_cell = vm::std_boc_deserialize(cell.slice_->bytes_); + if (r_cell.is_error()) { + sb << ""; + } + auto cs = vm::load_cell_slice(r_cell.move_as_ok()); + std::stringstream ss; + cs.print_rec(ss); + sb << ss.str(); + }, + [&](tonlib_api::tvm_stackEntryNumber& cell) { sb << cell.number_->number_; }, + [&](tonlib_api::tvm_stackEntryTuple& cell) { + sb << "("; + for (auto& element : cell.tuple_->elements_) { + sb << " "; + store_entry(sb, *element); + } + sb << " )"; + }, + [&](tonlib_api::tvm_stackEntryList& cell) { + sb << "["; + for (auto& element : cell.list_->elements_) { + sb << " "; + store_entry(sb, *element); + } + sb << " ]"; + }, + [&](tonlib_api::tvm_stackEntryUnsupported& cell) { sb << ""; })); + } + void run_method(td::ConstParser& parser, td::Promise promise) { TRY_RESULT_PROMISE(promise, addr, to_account_address(parser.read_word(), false)); @@ -492,15 +738,15 @@ class TonlibCli : public td::actor::Actor { } else { method = tonlib_api::make_object(method_str.str()); } - std::vector> stack; - while (true) { - auto word = parser.read_word(); - if (word.empty()) { - break; - } - TRY_RESULT_PROMISE(promise, stack_entry, parse_stack_entry(word)); - stack.push_back(std::move(stack_entry)); + TRY_RESULT_PROMISE(promise, stack, parse_stack(parser, "")); + td::StringBuilder sb; + for (auto& entry : stack) { + store_entry(sb, *entry); + sb << "\n"; } + + td::TerminalIO::out() << "Run " << to_string(method) << "With stack:\n" << sb.as_cslice(); + auto to_run = tonlib_api::make_object(0 /*fixme*/, std::move(method), std::move(stack)); @@ -513,9 +759,16 @@ class TonlibCli : public td::actor::Actor { to_run->id_ = info->id_; send_query(std::move(to_run), promise.send_closure(actor_id(this), &TonlibCli::run_method_3)); } - void run_method_3(tonlib_api::object_ptr info, td::Promise promise) { - td::TerminalIO::out() << "Got smc result " << to_string(info); + td::StringBuilder sb; + for (auto& entry : info->stack_) { + store_entry(sb, *entry); + sb << "\n"; + } + + td::TerminalIO::out() << "Got smc result. exit code: " << info->exit_code_ << ", gas_used: " << info->gas_used_ + << "\n" + << sb.as_cslice(); promise.set_value({}); } @@ -625,8 +878,20 @@ class TonlibCli : public td::actor::Actor { if (is_closing_) { return; } + tonlib_api::object_ptr func = std::move(query); + if (block_mode_ == BlockMode::Manual && func->get_id() != tonlib_api::sync::ID) { + if (!current_block_) { + promise.set_error(td::Status::Error("empty current block")); + return; + } + func = tonlib_api::make_object( + tonlib_api::make_object(current_block_->workchain_, current_block_->shard_, + current_block_->seqno_, current_block_->root_hash_, + current_block_->file_hash_), + std::move(func)); + } auto query_id = next_query_id_++; - td::actor::send_closure(client_, &tonlib::TonlibClient::request, query_id, std::move(query)); + td::actor::send_closure(client_, &tonlib::TonlibClient::request, query_id, std::move(func)); query_handlers_[query_id] = [promise = std::move(promise)](td::Result> r_obj) mutable { if (r_obj.is_error()) { @@ -742,7 +1007,6 @@ class TonlibCli : public td::actor::Actor { KeyInfo info; info.public_key = public_key; info.secret = r_secret.move_as_ok(); - LOG(INFO) << info.public_key; keys_.push_back(std::move(info)); } @@ -830,26 +1094,44 @@ class TonlibCli : public td::actor::Actor { td::SecureString secret; }; + template + auto with_account_state(int version, std::string public_key, td::uint32 wallet_id, F&& f) { + using tonlib_api::make_object; + if (version == 1) { + return f(make_object(public_key)); + } + if (version == 2) { + return f(make_object(public_key)); + } + if (version == 4) { + return f(make_object(public_key, wallet_id)); + } + if (version == 5) { + return f(make_object(public_key, wallet_id)); + } + if (version == 6) { + return f(make_object(public_key, wallet_id)); + } + return f(make_object(public_key, wallet_id)); + } + td::Result
to_account_address(td::Slice key, bool need_private_key) { if (key.empty()) { return td::Status::Error("account address is empty"); } + if (key == "none" && !need_private_key) { + return Address{}; + } auto r_key_i = to_key_i(key); using tonlib_api::make_object; if (r_key_i.is_ok()) { - auto obj = [&](td::int32 version) { - if (version == 1) { - return tonlib::TonlibClient::static_request(make_object( - make_object(keys_[r_key_i.ok()].public_key))); - } - if (version == 2) { - return tonlib::TonlibClient::static_request(make_object( - make_object(keys_[r_key_i.ok()].public_key))); - } - return tonlib::TonlibClient::static_request(make_object( - make_object(keys_[r_key_i.ok()].public_key, wallet_id_))); - UNREACHABLE(); - }(options_.wallet_version); + auto obj = [&](td::int32 version, td::int32 revision) { + auto do_request = [revision](auto x) { + return tonlib::TonlibClient::static_request( + make_object(std::move(x), revision)); + }; + return with_account_state(version, keys_[r_key_i.ok()].public_key, wallet_id_, do_request); + }(options_.wallet_version, options_.wallet_revision); if (obj->get_id() != tonlib_api::error::ID) { Address res; res.address = ton::move_tl_object_as(obj); @@ -859,7 +1141,8 @@ class TonlibCli : public td::actor::Actor { } } if (key == "giver") { - auto obj = tonlib::TonlibClient::static_request(make_object()); + auto obj = tonlib::TonlibClient::static_request( + make_object(make_object(), 0)); if (obj->get_id() != tonlib_api::error::ID) { Address res; res.address = ton::move_tl_object_as(obj); @@ -917,6 +1200,39 @@ class TonlibCli : public td::actor::Actor { cont_ = [this, cmd, key = key.str(), key_i](td::Slice password) { this->export_key(cmd, key, key_i, password); }; } + void import_key_pem(td::Slice filename, td::Promise promise) { + TRY_RESULT_PROMISE(promise, data, td::read_file_secure(filename.str())); + using tonlib_api::make_object; + send_query(make_object(td::SecureString(), td::SecureString("cucumber"), + make_object(std::move(data))), + promise.wrap([&](auto&& key) { + LOG(ERROR) << to_string(key); + KeyInfo info; + info.public_key = key->public_key_; + info.secret = std::move(key->secret_); + keys_.push_back(std::move(info)); + export_key("exportkey", key->public_key_, keys_.size() - 1, td::SecureString()); + store_keys(); + return td::Unit(); + })); + } + void import_key_raw(td::Slice filename, td::Promise promise) { + TRY_RESULT_PROMISE(promise, data, td::read_file_secure(filename.str())); + using tonlib_api::make_object; + send_query(make_object( + td::SecureString(), make_object(std::move(data))), + promise.wrap([&](auto&& key) { + LOG(ERROR) << to_string(key); + KeyInfo info; + info.public_key = key->public_key_; + info.secret = std::move(key->secret_); + keys_.push_back(std::move(info)); + export_key("exportkey", key->public_key_, keys_.size() - 1, td::SecureString()); + store_keys(); + return td::Unit(); + })); + } + void export_key(std::string cmd, std::string key, size_t key_i, td::Slice password) { using tonlib_api::make_object; if (cmd == "exportkey") { @@ -972,7 +1288,7 @@ class TonlibCli : public td::actor::Actor { void import_key(std::vector words, td::Slice password) { using tonlib_api::make_object; - send_query(make_object(td::SecureString(password), td::SecureString(), + send_query(make_object(td::SecureString(password), td::SecureString(""), make_object(std::move(words))), [this, password = td::SecureString(password)](auto r_res) { if (r_res.is_error()) { @@ -990,225 +1306,234 @@ class TonlibCli : public td::actor::Actor { }); } - void get_state(td::Slice key) { - if (key.empty()) { - dump_keys(); - td::TerminalIO::out() << "Choose public key (hex prefix or #N)"; - cont_ = [this](td::Slice key) { this->get_state(key); }; - on_wait(); - return; - } - auto r_address = to_account_address(key, false); - if (r_address.is_error()) { - td::TerminalIO::out() << "Unknown key id: [" << key << "]\n"; - on_error(); - return; - } - auto address = r_address.move_as_ok(); + void get_state(td::Slice key, td::Promise promise) { + TRY_RESULT_PROMISE(promise, address, to_account_address(key, false)); using tonlib_api::make_object; - send_query(make_object( + auto address_str = address.address->account_address_; + send_query(make_object( ton::move_tl_object_as(std::move(address.address))), - [this](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't get state: " << r_res.error() << "\n"; - on_error(); - return; - } - td::TerminalIO::out() << to_string(r_res.ok()); - on_ok(); - }); + promise.wrap([address_str](auto&& state) { + td::TerminalIO::out() << "Address: " << address_str << "\n"; + td::TerminalIO::out() << "Balance: " + << Grams{td::narrow_cast(state->balance_ * (state->balance_ > 0))} + << "\n"; + td::TerminalIO::out() << "Sync utime: " << state->sync_utime_ << "\n"; + td::TerminalIO::out() << "transaction.LT: " << state->last_transaction_id_->lt_ << "\n"; + td::TerminalIO::out() << "transaction.Hash: " << td::base64_encode(state->last_transaction_id_->hash_) + << "\n"; + td::TerminalIO::out() << to_string(state->account_state_); + return td::Unit(); + })); } - void get_history(td::Slice key) { - if (key.empty()) { - dump_keys(); - td::TerminalIO::out() << "Choose public key (hex prefix or #N)"; - cont_ = [this](td::Slice key) { this->get_state(key); }; - return; - } - auto r_address = to_account_address(key, false); - if (r_address.is_error()) { - td::TerminalIO::out() << "Unknown key id: [" << key << "]\n"; - return; - } - auto address = r_address.move_as_ok(); + + void get_address(td::Slice key, td::Promise promise) { + TRY_RESULT_PROMISE(promise, address, to_account_address(key, false)); + promise.set_value(td::Unit()); + td::TerminalIO::out() << address.address->account_address_ << "\n"; + } + + void get_history(td::Slice key, td::Promise promise) { + TRY_RESULT_PROMISE(promise, address, to_account_address(key, false)); using tonlib_api::make_object; - send_query(make_object( + send_query(make_object( ton::move_tl_object_as(std::move(address.address))), - [this, key = key.str()](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't get state: " << r_res.error() << "\n"; - return; - } - this->get_history(key, *r_res.move_as_ok()); - }); + promise.send_closure(td::actor::actor_id(this), &TonlibCli::get_history2, key.str())); } - void get_history(td::Slice key, tonlib_api::generic_AccountState& state) { - auto r_address = to_account_address(key, false); + void guess_revision(td::Slice key, td::Promise promise) { + TRY_RESULT_PROMISE(promise, key_i, to_key_i(key)); + with_account_state(options_.wallet_version, keys_[key_i].public_key, wallet_id_, [&](auto state) { + using tonlib_api::make_object; + send_query(make_object(std::move(state)), promise.wrap([](auto revisions) { + td::TerminalIO::out() << to_string(revisions); + return td::Unit(); + })); + }); + } + + void get_history2(td::Slice key, td::Result> r_state, + td::Promise promise) { + TRY_RESULT_PROMISE(promise, state, std::move(r_state)); + auto r_address = to_account_address(key, true); if (r_address.is_error()) { - td::TerminalIO::out() << "Unknown key id: [" << key << "]\n"; - return; + r_address = to_account_address(key, false); } - auto address = r_address.move_as_ok(); + TRY_RESULT_PROMISE(promise, address, std::move(r_address)); + td::Slice password; + using tonlib_api::make_object; + auto input_key = + !address.secret.empty() + ? make_object( + make_object(address.public_key, address.secret.copy()), td::SecureString(password)) + : nullptr; - tonlib_api::object_ptr transaction_id; - downcast_call(state, [&](auto& state) { transaction_id = std::move(state.account_state_->last_transaction_id_); }); - - send_query( - tonlib_api::make_object( - ton::move_tl_object_as(std::move(address.address)), std::move(transaction_id)), - [](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't get transactions: " << r_res.error() << "\n"; - return; - } - td::TerminalIO::out() << to_string(r_res.move_as_ok()) << "\n"; - }); + send_query(tonlib_api::make_object( + std::move(input_key), ton::move_tl_object_as(std::move(address.address)), + std::move(state->last_transaction_id_)), + promise.wrap([](auto res) { + td::StringBuilder sb; + for (tonlib_api::object_ptr& t : res->transactions_) { + td::int64 balance = 0; + balance += t->in_msg_->value_; + for (auto& ot : t->out_msgs_) { + balance -= ot->value_; + } + if (balance >= 0) { + sb << Grams{td::uint64(balance)}; + } else { + sb << "-" << Grams{td::uint64(-balance)}; + } + sb << " Fee: " << Grams{td::uint64(t->fee_)}; + if (t->in_msg_->source_.empty()) { + sb << " External "; + } else { + sb << " From " << t->in_msg_->source_; + } + auto print_msg_data = [](td::StringBuilder& sb, + tonlib_api::object_ptr& msg_data) { + if (!msg_data) { + return; + } + sb << " "; + downcast_call(*msg_data, + td::overloaded([&](tonlib_api::msg_dataRaw& raw) { sb << ""; }, + [&](tonlib_api::msg_dataText& raw) { sb << "{" << raw.text_ << "}"; }, + [&](tonlib_api::msg_dataEncryptedText& raw) { sb << ""; }, + [&](tonlib_api::msg_dataDecryptedText& raw) { + sb << "decrypted{" << raw.text_ << "}"; + })); + }; + print_msg_data(sb, t->in_msg_->msg_data_); + for (auto& ot : t->out_msgs_) { + sb << "\n\t"; + if (ot->destination_.empty()) { + sb << " External "; + } else { + sb << " To " << ot->destination_; + } + sb << " " << Grams{td::uint64(ot->value_)}; + print_msg_data(sb, ot->msg_data_); + } + sb << "\n"; + } + td::TerminalIO::out() << sb.as_cslice() << "\n"; + return td::Unit(); + })); } - void transfer(td::Slice from, td::Slice to, td::Slice grams, td::Slice message, bool allow_send_to_uninited) { - auto r_from_address = to_account_address(from, true); - if (r_from_address.is_error()) { - td::TerminalIO::out() << "Unknown key id: [" << from << "] : " << r_from_address.error() << "\n"; - on_error(); - return; + void transfer(td::ConstParser& parser, td::Slice cmd, td::Promise cmd_promise) { + bool from_file = false; + bool force = false; + bool use_encryption = false; + bool use_fake_key = false; + bool estimate_fees = false; + if (cmd != "init") { + td::ConstParser cmd_parser(cmd); + cmd_parser.advance(td::Slice("transfer").size()); + while (!cmd_parser.empty()) { + auto c = cmd_parser.peek_char(); + cmd_parser.advance(1); + if (c == 'F') { + from_file = true; + } else if (c == 'f') { + force = true; + } else if (c == 'e') { + use_encryption = true; + } else if (c == 'k') { + use_fake_key = true; + } else if (c == 'c') { + estimate_fees = true; + } else { + cmd_promise.set_error(td::Status::Error(PSLICE() << "Unknown suffix '" << c << "'")); + return; + } + } } - auto r_to_address = to_account_address(to, false); - if (r_to_address.is_error()) { - td::TerminalIO::out() << "Unknown key id: [" << to << "] : " << r_to_address.error() << "\n"; - on_error(); - return; - } - auto r_grams = td::to_integer_safe(grams); - if (r_grams.is_error()) { - td::TerminalIO::out() << "Invalid grams amount: [" << grams << "]\n"; - on_error(); - return; - } - if (options_.one_shot) { - transfer(r_from_address.move_as_ok(), r_to_address.move_as_ok(), r_grams.move_as_ok(), "", "", - allow_send_to_uninited); - return; - } - if (from != "giver" && message.empty()) { - td::TerminalIO::out() << "Enter password (could be empty)"; - cont_ = [this, from = r_from_address.move_as_ok(), to = r_to_address.move_as_ok(), grams = r_grams.move_as_ok(), - allow_send_to_uninited](td::Slice password) mutable { - this->transfer(std::move(from), std::move(to), grams, password, allow_send_to_uninited); - }; - on_wait(); - return; - } - if (message.empty()) { - transfer(r_from_address.move_as_ok(), r_to_address.move_as_ok(), r_grams.move_as_ok(), "", - allow_send_to_uninited); - } else { - transfer(r_from_address.move_as_ok(), r_to_address.move_as_ok(), r_grams.move_as_ok(), "", message, - allow_send_to_uninited); - } - } - void transfer(Address from, Address to, td::uint64 grams, td::Slice password, bool allow_send_to_uninited) { - td::TerminalIO::out() << "Enter message (could be empty)"; - cont_ = [this, from = std::move(from), to = std::move(to), grams, password = password.str(), - allow_send_to_uninited](td::Slice message) mutable { - this->transfer(std::move(from), std::move(to), grams, password, message, allow_send_to_uninited); + auto from = parser.read_word(); + TRY_RESULT_PROMISE(cmd_promise, from_address, to_account_address(from, true)); + + struct Message { + Address to; + td::int64 amount; + std::string message; }; - on_wait(); - return; - } - void transfer(Address from, Address to, td::uint64 grams, td::Slice password, td::Slice message, - bool allow_send_to_uninited) { - auto r_sz = td::to_integer_safe(message); - auto msg = message.str(); - if (r_sz.is_ok()) { - msg = std::string(r_sz.ok(), 'Z'); - } - using tonlib_api::make_object; - auto key = !from.secret.empty() - ? make_object( - make_object(from.public_key, from.secret.copy()), td::SecureString(password)) - : nullptr; - send_query(make_object(std::move(key), std::move(from.address), - std::move(to.address), grams, 60, - allow_send_to_uninited, std::move(msg)), - [self = this](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't transfer: " << r_res.error() << "\n"; - self->on_error(); - return; - } - td::TerminalIO::out() << to_string(r_res.ok()); - self->send_query(make_object(r_res.ok()->id_, false), - [self](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't transfer: " << r_res.error() << "\n"; - self->on_error(); - return; - } - td::TerminalIO::out() << to_string(r_res.ok()); - self->on_ok(); - }); - self->send_query(make_object(r_res.ok()->id_), [self](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't transfer: " << r_res.error() << "\n"; - self->on_error(); - return; - } - td::TerminalIO::out() << to_string(r_res.ok()); - self->on_ok(); - }); + std::vector> messages; + auto add_message = [&](td::ConstParser& parser) { + auto to = parser.read_word(); + auto grams = parser.read_word(); + parser.skip_whitespaces(); + auto message = parser.read_all(); - self->on_ok(); - }); - } + Message res; + TRY_RESULT(address, to_account_address(to, false)); + TRY_RESULT(amount, parse_grams(grams)); + tonlib_api::object_ptr data; - void init_simple_wallet(td::Slice key) { - if (key.empty()) { - dump_keys(); - td::TerminalIO::out() << "Choose public key (hex prefix or #N)"; - cont_ = [this](td::Slice key) { this->init_simple_wallet(key); }; - return; - } - auto r_key_i = to_key_i(key); - if (r_key_i.is_error()) { - td::TerminalIO::out() << "Unknown key id: [" << key << "]\n"; - return; - } - auto key_i = r_key_i.move_as_ok(); + if (use_encryption) { + data = tonlib_api::make_object(message.str()); + } else { + data = tonlib_api::make_object(message.str()); + } + messages.push_back( + tonlib_api::make_object(std::move(address.address), amount.nano, std::move(data))); + return td::Status::OK(); + }; - td::TerminalIO::out() << "Key #" << key_i << "\n" - << "public key: " << td::buffer_to_hex(keys_[key_i].public_key) << "\n"; - - td::TerminalIO::out() << "Enter password (could be empty)"; - cont_ = [this, key = key.str(), key_i](td::Slice password) { this->init_simple_wallet(key, key_i, password); }; - } - - void init_simple_wallet(std::string key, size_t key_i, td::Slice password) { - using tonlib_api::make_object; - if (options_.wallet_version == 1) { - send_query(make_object(make_object( - make_object(keys_[key_i].public_key, keys_[key_i].secret.copy()), - td::SecureString(password))), - [key = std::move(key)](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't init wallet with key: [" << key << "] " << r_res.error() << "\n"; - return; - } - td::TerminalIO::out() << to_string(r_res.ok()); - }); + if (from_file) { + TRY_RESULT_PROMISE(cmd_promise, data, td::read_file(parser.read_word().str())); + auto lines = td::full_split(data.as_slice(), '\n'); + for (auto& line : lines) { + td::ConstParser parser(line); + parser.skip_whitespaces(); + if (parser.empty()) { + continue; + } + if (parser.read_word() != "SEND") { + TRY_STATUS_PROMISE(cmd_promise, td::Status::Error("Expected `SEND` in file")); + } + TRY_STATUS_PROMISE(cmd_promise, add_message(parser)); + } } else { - send_query(make_object(make_object( - make_object(keys_[key_i].public_key, keys_[key_i].secret.copy()), - td::SecureString(password))), - [key = std::move(key)](auto r_res) { - if (r_res.is_error()) { - td::TerminalIO::out() << "Can't init wallet with key: [" << key << "] " << r_res.error() << "\n"; - return; - } - td::TerminalIO::out() << to_string(r_res.ok()); - }); + while (parser.skip_whitespaces(), !parser.empty()) { + TRY_STATUS_PROMISE(cmd_promise, add_message(parser)); + } + } + + td::Slice password; // empty by default + using tonlib_api::make_object; + tonlib_api::object_ptr key = + !from_address.secret.empty() + ? make_object( + make_object(from_address.public_key, from_address.secret.copy()), + td::SecureString(password)) + : nullptr; + if (use_fake_key) { + key = make_object(); + } + + bool allow_send_to_uninited = force; + + send_query(make_object( + std::move(key), std::move(from_address.address), 60, + make_object(std::move(messages), allow_send_to_uninited)), + cmd_promise.send_closure(actor_id(this), &TonlibCli::transfer2, estimate_fees)); + } + + void transfer2(bool estimate_fees, td::Result> r_info, + td::Promise cmd_promise) { + if (estimate_fees) { + send_query(tonlib_api::make_object(r_info.ok()->id_, true), + cmd_promise.wrap([](auto&& info) { + td::TerminalIO::out() << "Extimated fees: " << to_string(info); + return td::Unit(); + })); + } else { + send_query(tonlib_api::make_object(r_info.ok()->id_), cmd_promise.wrap([](auto&& info) { + td::TerminalIO::out() << "Transfer sent: " << to_string(info); + return td::Unit(); + })); } } @@ -1280,8 +1605,22 @@ int main(int argc, char* argv[]) { options.use_callbacks_for_network = true; return td::Status::OK(); }); - p.add_option('W', "wallet-version", "do not use this", [&](td::Slice arg) { - options.wallet_version = td::to_integer(arg); + p.add_option('w', "wallet-id", "do not use this", [&](td::Slice arg) { + TRY_RESULT(wallet_id, td::to_integer_safe((arg))); + options.wallet_id = wallet_id; + return td::Status::OK(); + }); + p.add_option('W', "wallet-version", "do not use this (version[.revision])", [&](td::Slice arg) { + td::ConstParser parser(arg); + TRY_RESULT(version, td::to_integer_safe((parser.read_till_nofail('.')))); + options.wallet_version = version; + LOG(INFO) << "Use wallet version = " << version; + if (parser.peek_char() == '.') { + parser.skip('.'); + TRY_RESULT(revision, td::to_integer_safe((parser.read_all()))); + options.wallet_revision = revision; + LOG(INFO) << "Use wallet revision = " << revision; + } return td::Status::OK(); });