mirror of
https://github.com/ton-blockchain/ton
synced 2025-03-09 15:40:10 +00:00
TVM Upgrade (#686)
* New TVM instructions * Remove PREVBLOCKS * Separate target ton_crypto into TVM-related and -unrelared code * Add fine for failed "send message"; rework SENDMSG * Fix include * Fix bugs, improve action fines * Disable fines for special accounts * Handle msg_balance_remaining.grams == null in transaction.cpp * Bugfixes in SENDMSG * Fix fee calculation in SENDMSG * Fix CellStorageStat and transaction.cpp after merge * SETBOUNCEONACTIONPHASEFAIL instruction * ADDDIVMOD instructions * RUNVM, RUNVMX instructions * Changes in RUNVM * Tests for adddiv and runvm * HASHEXT instruction * Improve opcode-timing More iterations Don't measure preliminary run Remove logs and other excessive operations Add "error" to output * Increase RUNVM gas price * Optimize HASHEXT, adjust gas price * Add "bounce of action fail" flag to actions * Stack operations with unlimited arguments * Ristretto255 instructions * Adjust gas consumption * Optional fixed number of return values in RUNVM, fix exception handling * Adjust gas consumption * Simplify gas consumption logic * Support of secp256k1 and sodium libraries in builds (#11) * add support of secp256k1 library to the builds (linux, win) * add support of secp256k1 library to the builds (linux, win) * install secp256k1 via brew * install libsodium via brew; change sodium to upper case in FindSodium.cmake * install libsodium via brew; change sodium to upper case in FindSodium.cmake * simplify FindSodium.cmake * bug fixing * bug fixing * bug fixing * add macro SODIUM_STATIC * adjust build command for windows * put back original FindSodium.cmake * put back original FindSodium.cmake * fix sodium unzipped path for windows; add ninja * fix sodium unzipped path for windows; add ninja * fix sodium unzipped path for windows; add ninja * Win32 github build for secp256k1 * x64 architecture github build for secp256k1 * fix sodium linking on linux * enable docker buildx arm64 builds from forked repos * enable docker buildx arm64 builds from forked repos * enable docker buildx arm64 builds from forked repos * adjust mac builds for secp2561k and sodium * fix tonlib jni generation * minor fix * sync fixes across platforms * add libsodium build script for android and precompiled static libraries * build tonlib for android (fails) * FindSodium uppercase * remove system libsodium for android, use precompiled instead; specify SECP256K1_INCLUDE_DIR fir mac 12.6 * uppercase sodium * simplify FindSodium * fix windows build sodium path; use ninja for windows * simplify sodium 2 * adjust windows sodium paths; add paths to android jni * add ninja build windows * add ninja build windows * add ninja build windows 2 * remove win ninja * fix 1 * fix 2 * fix win 3 * fix linux compile 3 * fix jni 1 * fix jni 2 and mac * fix jni 3 * fix jni 4 * fix jni 5 * fix mac 6 * fix mac 7 and jni paths * fix jni 8 * rework sodium for android * rework sodium for android * rework sodium for android 2 * fixed sodium for android 2 * fixed sodium for android 3 * static secp256k1 for android * add precompiled arm secp256k1 * add precompiled arm secp256k1 * build native-lib with secp256k1 x86-64 (non arm) * update precompiled with NDK libsecp256k1.a * update precompiled with NDK libsecp256k1.a * update precompiled with NDK libsecp256k1.a * refactor llvm-strip location * refactor llvm-strip location * add native-lib.so for armv7a, armv8a * add native-lib.so for armv7a, armv8a * test armv7a, armv8a * armv7a - fails linking on sodium, test -> armv8a * works x86-64, armv7a - fails linking on sodium, armv8a - fails linking secp256k1 (incompatible with aarch64linux) * update libpsec256k1, sodium static libs * test x86 android native-lib * test armv7 android native-lib * test armv8 android native-lib * x86_64 and arm64 android native-lib works * x86_64 and arm64 android native-lib works * x86_64 and arm64 android native-lib works * test armv7 android native-lib * test all android native-libs * test all android native-libs * test all android native-libs * test all android native-libs - without SodiumAndroid * test all android native-libs - with FindSodiumAndroid.cmake * win, with Sodium via SODIUM_DIR * win, with Sodium via SODIUM_DIR env * win, with Sodium via SODIUM_DIR env * win, with Sodium via SODIUM_DIR env and SODIUM_USE_STATIC_LIBS * win, with Sodium via SODIUM_DIR, SODIUM_USE_STATIC_LIBS and SODIUM_INCLUDE_DIR * android, with FindSodium * android, with FindSodium with SODIUM_USE_STATIC_LIBS * remove if not apple * target_link_libraries(ton_crypto_core PUBLIC secp256k1) * android SECP256K1_INCLUDE_DIRS * android SECP256K1_INCLUDE_DIR * add libsecp256k1.a/so pre-compiled with ubuntu 22 x86-64 * add libsecp256k1.a/so pre-compiled with ubuntu 22 x86-64 * sodium dirs * sodium dirs * sodium dirs * remove NOT APPLE and SodiumAndroid * add NOT APPLE and remove SodiumAndroid * add NOT APPLE and remove SodiumAndroid * remove build scripts for 18.04, reduce CMakeLists.txt * remove build scripts for 18.04, reduce CMakeLists.txt * Fix cas consumption during library load * Fix fetch_config_params after merge * Add all ADDDIVMOD ops to Asm.fif * Save unpaid storage fee to due_payment * Add "set prev blocks info" to emulator * Adjusted builds (#13) * Update flake.nix Add libsodium * add libsecp256k1-dev and libsodium-dev into wasm build * make back emulator a shared library; put emulator to artifacts; compile wasm artifacts with sodium and secp256k1. * add secp256k1 to nix * compile emulator statically with nix * compile emulator statically with nix * compile emulator lib statically with nix * compile emulator lib statically with nix * add libemulator to artifacts * add shared libemulator library to artifacts * minor release fix * update set-output commands; add recent_changelog.md * releases fixes * releases fixes, multiline * releases fixes, multiline * releases fixes, multiline * put back multiline changelog * put back multiline changelog * ConfigParam 19 (global-id) and GLOBALID instruction * Fix gas consumption in HASHEXT * Add blst library * Add bls instructions * Allow passing long code to opcode-timing * Add bls testcase * More BLS instructions * Fix tests, add bls tests * Add more bls tests * Improve some bls operations * Adjust some BLS gas prices * Adjust BLS gas prices * Enable __BLST_PORTABLE__ flag only if PORTABLE flag is set * Add tests for BLS_PAIRING * GASCONSUMED instruction * Fix compilation against docker with blst library; (#14) * fix compilation against docker with blst library; add precompiled libblst.a to android builds * minor fix * Adjust BLKSWX gas * Fix comparison with NAN * Allow arbitrary integers for scalars in ristretto multiplication, fix test * Adjust nix builds according to PR 694 (#15) * integrate and test PR-694 * integrate and test PR-694, test 2 * Add P256_CHKSIGN (secp256r1) --------- Co-authored-by: SpyCheese <mikle98@yandex.ru> Co-authored-by: neodiX42 <namlem@gmail.com>
This commit is contained in:
EmelyanenkoK
GitHub
parent
d6b11d9d36
commit
9f93888cf4
374 changed files with 25800 additions and 387 deletions
|
|
@ -265,26 +265,42 @@ void register_add_mul_ops(OpcodeTable& cp0) {
|
|||
|
||||
int exec_divmod(VmState* st, unsigned args, int quiet) {
|
||||
int round_mode = (int)(args & 3) - 1;
|
||||
if (!(args & 12) || round_mode == 2) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0 && st->get_global_version() >= 4) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (d == 0 || round_mode == 2) {
|
||||
throw VmError{Excno::inv_opcode};
|
||||
}
|
||||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute DIV/MOD " << (args & 15);
|
||||
stack.check_underflow(2);
|
||||
stack.check_underflow(add ? 3 : 2);
|
||||
auto y = stack.pop_int();
|
||||
auto w = add ? stack.pop_int() : td::RefInt256{};
|
||||
auto x = stack.pop_int();
|
||||
switch ((args >> 2) & 3) {
|
||||
case 1:
|
||||
stack.push_int_quiet(td::div(std::move(x), std::move(y), round_mode), quiet);
|
||||
break;
|
||||
case 2:
|
||||
stack.push_int_quiet(td::mod(std::move(x), std::move(y), round_mode), quiet);
|
||||
break;
|
||||
case 3: {
|
||||
auto dm = td::divmod(std::move(x), std::move(y), round_mode);
|
||||
stack.push_int_quiet(std::move(dm.first), quiet);
|
||||
stack.push_int_quiet(std::move(dm.second), quiet);
|
||||
break;
|
||||
if (add) {
|
||||
CHECK(d == 3);
|
||||
typename td::BigInt256::DoubleInt tmp{*x}, quot;
|
||||
tmp += *w;
|
||||
tmp.mod_div(*y, quot, round_mode);
|
||||
stack.push_int_quiet(td::make_refint(quot), quiet);
|
||||
stack.push_int_quiet(td::make_refint(tmp), quiet);
|
||||
} else {
|
||||
switch (d) {
|
||||
case 1:
|
||||
stack.push_int_quiet(td::div(std::move(x), std::move(y), round_mode), quiet);
|
||||
break;
|
||||
case 2:
|
||||
stack.push_int_quiet(td::mod(std::move(x), std::move(y), round_mode), quiet);
|
||||
break;
|
||||
case 3: {
|
||||
auto dm = td::divmod(std::move(x), std::move(y), round_mode);
|
||||
stack.push_int_quiet(std::move(dm.first), quiet);
|
||||
stack.push_int_quiet(std::move(dm.second), quiet);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -292,11 +308,20 @@ int exec_divmod(VmState* st, unsigned args, int quiet) {
|
|||
|
||||
std::string dump_divmod(CellSlice&, unsigned args, bool quiet) {
|
||||
int round_mode = (int)(args & 3);
|
||||
if (!(args & 12) || round_mode == 3) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (round_mode == 3) {
|
||||
return "";
|
||||
}
|
||||
std::string s = (args & 4) ? "DIV" : "";
|
||||
if (args & 8) {
|
||||
std::string s = add ? "ADD" : "";
|
||||
if (d & 1) {
|
||||
s += "DIV";
|
||||
}
|
||||
if (d & 2) {
|
||||
s += "MOD";
|
||||
}
|
||||
if (quiet) {
|
||||
|
|
@ -312,32 +337,50 @@ int exec_shrmod(VmState* st, unsigned args, int mode) {
|
|||
args >>= 8;
|
||||
}
|
||||
int round_mode = (int)(args & 3) - 1;
|
||||
if (!(args & 12) || round_mode == 2) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0 && st->get_global_version() >= 4) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (d == 0 || round_mode == 2) {
|
||||
throw VmError{Excno::inv_opcode};
|
||||
}
|
||||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute SHR/MOD " << (args & 15) << ',' << y;
|
||||
if (!(mode & 2)) {
|
||||
stack.check_underflow(2);
|
||||
stack.check_underflow(add ? 3 : 2);
|
||||
y = stack.pop_smallint_range(256);
|
||||
} else {
|
||||
stack.check_underflow(1);
|
||||
stack.check_underflow(add ? 2 : 1);
|
||||
}
|
||||
if (!y) {
|
||||
round_mode = -1;
|
||||
}
|
||||
auto w = add ? stack.pop_int() : td::RefInt256{};
|
||||
auto x = stack.pop_int();
|
||||
switch ((args >> 2) & 3) {
|
||||
case 1:
|
||||
stack.push_int_quiet(td::rshift(std::move(x), y, round_mode), mode & 1);
|
||||
break;
|
||||
case 3:
|
||||
stack.push_int_quiet(td::rshift(x, y, round_mode), mode & 1);
|
||||
// fallthrough
|
||||
case 2:
|
||||
x.write().mod_pow2(y, round_mode).normalize();
|
||||
stack.push_int_quiet(std::move(x), mode & 1);
|
||||
break;
|
||||
if (add) {
|
||||
CHECK(d == 3);
|
||||
typename td::BigInt256::DoubleInt tmp{*x}, quot;
|
||||
tmp += *w;
|
||||
typename td::BigInt256::DoubleInt tmp2{tmp};
|
||||
tmp2.rshift(y, round_mode).normalize();
|
||||
stack.push_int_quiet(td::make_refint(tmp2), mode & 1);
|
||||
tmp.normalize().mod_pow2(y, round_mode).normalize();
|
||||
stack.push_int_quiet(td::make_refint(tmp), mode & 1);
|
||||
} else {
|
||||
switch (d) {
|
||||
case 1:
|
||||
stack.push_int_quiet(td::rshift(std::move(x), y, round_mode), mode & 1);
|
||||
break;
|
||||
case 3:
|
||||
stack.push_int_quiet(td::rshift(x, y, round_mode), mode & 1);
|
||||
// fallthrough
|
||||
case 2:
|
||||
x.write().mod_pow2(y, round_mode).normalize();
|
||||
stack.push_int_quiet(std::move(x), mode & 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -349,7 +392,7 @@ std::string dump_shrmod(CellSlice&, unsigned args, int mode) {
|
|||
args >>= 8;
|
||||
}
|
||||
int round_mode = (int)(args & 3);
|
||||
if (!(args & 12) || round_mode == 3) {
|
||||
if (round_mode == 3) {
|
||||
return "";
|
||||
}
|
||||
std::ostringstream os;
|
||||
|
|
@ -366,6 +409,9 @@ std::string dump_shrmod(CellSlice&, unsigned args, int mode) {
|
|||
case 12:
|
||||
os << "RSHIFTMOD";
|
||||
break;
|
||||
case 0:
|
||||
os << "ADDRSHIFTMOD";
|
||||
break;
|
||||
}
|
||||
if (round_mode) {
|
||||
os << "FRC"[round_mode];
|
||||
|
|
@ -378,20 +424,30 @@ std::string dump_shrmod(CellSlice&, unsigned args, int mode) {
|
|||
|
||||
int exec_muldivmod(VmState* st, unsigned args, int quiet) {
|
||||
int round_mode = (int)(args & 3) - 1;
|
||||
if (!(args & 12) || round_mode == 2) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0 && st->get_global_version() >= 4) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (d == 0 || round_mode == 2) {
|
||||
throw VmError{Excno::inv_opcode};
|
||||
}
|
||||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute MULDIV/MOD " << (args & 15);
|
||||
stack.check_underflow(3);
|
||||
stack.check_underflow(add ? 4 : 3);
|
||||
auto z = stack.pop_int();
|
||||
auto w = add ? stack.pop_int() : td::RefInt256{};
|
||||
auto y = stack.pop_int();
|
||||
auto x = stack.pop_int();
|
||||
typename td::BigInt256::DoubleInt tmp{0}, quot;
|
||||
if (add) {
|
||||
tmp = *w;
|
||||
}
|
||||
tmp.add_mul(*x, *y);
|
||||
auto q = td::make_refint();
|
||||
tmp.mod_div(*z, quot, round_mode);
|
||||
switch ((args >> 2) & 3) {
|
||||
switch (d) {
|
||||
case 1:
|
||||
stack.push_int_quiet(td::make_refint(quot.normalize()), quiet);
|
||||
break;
|
||||
|
|
@ -407,11 +463,20 @@ int exec_muldivmod(VmState* st, unsigned args, int quiet) {
|
|||
|
||||
std::string dump_muldivmod(CellSlice&, unsigned args, bool quiet) {
|
||||
int round_mode = (int)(args & 3);
|
||||
if (!(args & 12) || round_mode == 3) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (round_mode == 3) {
|
||||
return "";
|
||||
}
|
||||
std::string s = (args & 4) ? "MULDIV" : "MUL";
|
||||
if (args & 8) {
|
||||
std::string s = add ? "MULADD" : "MUL";
|
||||
if (d & 1) {
|
||||
s += "DIV";
|
||||
}
|
||||
if (d & 2) {
|
||||
s += "MOD";
|
||||
}
|
||||
if (quiet) {
|
||||
|
|
@ -427,25 +492,35 @@ int exec_mulshrmod(VmState* st, unsigned args, int mode) {
|
|||
args >>= 8;
|
||||
}
|
||||
int round_mode = (int)(args & 3) - 1;
|
||||
if (!(args & 12) || round_mode == 2) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0 && st->get_global_version() >= 4) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (d == 0 || round_mode == 2) {
|
||||
throw VmError{Excno::inv_opcode};
|
||||
}
|
||||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute MULSHR/MOD " << (args & 15) << ',' << z;
|
||||
if (!(mode & 2)) {
|
||||
stack.check_underflow(3);
|
||||
stack.check_underflow(add ? 4 : 3);
|
||||
z = stack.pop_smallint_range(256);
|
||||
} else {
|
||||
stack.check_underflow(2);
|
||||
stack.check_underflow(add ? 3 : 2);
|
||||
}
|
||||
if (!z) {
|
||||
round_mode = -1;
|
||||
}
|
||||
auto w = add ? stack.pop_int() : td::RefInt256{};
|
||||
auto y = stack.pop_int();
|
||||
auto x = stack.pop_int();
|
||||
typename td::BigInt256::DoubleInt tmp{0};
|
||||
if (add) {
|
||||
tmp = *w;
|
||||
}
|
||||
tmp.add_mul(*x, *y);
|
||||
switch ((args >> 2) & 3) {
|
||||
switch (d) {
|
||||
case 1:
|
||||
tmp.rshift(z, round_mode).normalize();
|
||||
stack.push_int_quiet(td::make_refint(tmp), mode & 1);
|
||||
|
|
@ -471,7 +546,7 @@ std::string dump_mulshrmod(CellSlice&, unsigned args, int mode) {
|
|||
args >>= 8;
|
||||
}
|
||||
int round_mode = (int)(args & 3);
|
||||
if (!(args & 12) || round_mode == 3) {
|
||||
if (round_mode == 3) {
|
||||
return "";
|
||||
}
|
||||
std::ostringstream os;
|
||||
|
|
@ -488,6 +563,9 @@ std::string dump_mulshrmod(CellSlice&, unsigned args, int mode) {
|
|||
case 12:
|
||||
os << "MULRSHIFTMOD";
|
||||
break;
|
||||
case 0:
|
||||
os << "MULADDRSHIFTMOD";
|
||||
break;
|
||||
}
|
||||
if (round_mode) {
|
||||
os << "FRC"[round_mode];
|
||||
|
|
@ -505,22 +583,32 @@ int exec_shldivmod(VmState* st, unsigned args, int mode) {
|
|||
args >>= 8;
|
||||
}
|
||||
int round_mode = (int)(args & 3) - 1;
|
||||
if (!(args & 12) || round_mode == 2) {
|
||||
unsigned d = (args >> 2) & 3;
|
||||
bool add = false;
|
||||
if (d == 0 && st->get_global_version() >= 4) {
|
||||
d = 3;
|
||||
add = true;
|
||||
}
|
||||
if (d == 0 || round_mode == 2) {
|
||||
throw VmError{Excno::inv_opcode};
|
||||
}
|
||||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute SHLDIV/MOD " << (args & 15) << ',' << y;
|
||||
if (!(mode & 2)) {
|
||||
stack.check_underflow(3);
|
||||
stack.check_underflow(add ? 4 : 3);
|
||||
y = stack.pop_smallint_range(256);
|
||||
} else {
|
||||
stack.check_underflow(2);
|
||||
stack.check_underflow(add ? 3 : 2);
|
||||
}
|
||||
auto z = stack.pop_int();
|
||||
auto w = add ? stack.pop_int() : td::RefInt256{};
|
||||
auto x = stack.pop_int();
|
||||
typename td::BigInt256::DoubleInt tmp{*x}, quot;
|
||||
tmp <<= y;
|
||||
switch ((args >> 2) & 3) {
|
||||
if (add) {
|
||||
tmp += *w;
|
||||
}
|
||||
switch (d) {
|
||||
case 1: {
|
||||
tmp.mod_div(*z, quot, round_mode);
|
||||
stack.push_int_quiet(td::make_refint(quot.normalize()), mode & 1);
|
||||
|
|
@ -549,11 +637,27 @@ std::string dump_shldivmod(CellSlice&, unsigned args, int mode) {
|
|||
args >>= 8;
|
||||
}
|
||||
int round_mode = (int)(args & 3);
|
||||
if (!(args & 12) || round_mode == 3) {
|
||||
if (round_mode == 3) {
|
||||
return "";
|
||||
}
|
||||
std::ostringstream os;
|
||||
os << (mode & 1 ? "Q" : "") << (args & 4 ? "LSHIFTDIV" : "LSHIFT") << (args & 8 ? "MOD" : "");
|
||||
if (mode & 1) {
|
||||
os << "Q";
|
||||
}
|
||||
switch (args & 12) {
|
||||
case 4:
|
||||
os << "LSHIFTDIV";
|
||||
break;
|
||||
case 8:
|
||||
os << "LSHIFTMOD";
|
||||
break;
|
||||
case 12:
|
||||
os << "LSHIFTDIVMOD";
|
||||
break;
|
||||
case 0:
|
||||
os << "LSHIFTADDDIVMOD";
|
||||
break;
|
||||
}
|
||||
if (round_mode) {
|
||||
os << "FRC"[round_mode];
|
||||
}
|
||||
|
|
@ -855,7 +959,9 @@ int exec_cmp(VmState* st, int mode, bool quiet, const char* name) {
|
|||
auto y = stack.pop_int();
|
||||
auto x = stack.pop_int();
|
||||
if (!x->is_valid() || !y->is_valid()) {
|
||||
stack.push_int_quiet(std::move(x), quiet);
|
||||
td::RefInt256 r{true};
|
||||
r.unique_write().invalidate();
|
||||
stack.push_int_quiet(std::move(r), quiet);
|
||||
} else {
|
||||
int z = td::cmp(std::move(x), std::move(y));
|
||||
stack.push_smallint(((mode >> (4 + z * 4)) & 15) - 8);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue