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
|
|
@ -301,9 +301,7 @@ int exec_blkswap(VmState* st, unsigned args) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute BLKSWAP " << x << ',' << y;
|
||||
stack.check_underflow(x + y);
|
||||
std::reverse(stack.from_top(x + y), stack.from_top(y));
|
||||
std::reverse(stack.from_top(y), stack.top());
|
||||
std::reverse(stack.from_top(x + y), stack.top());
|
||||
std::rotate(stack.from_top(x + y), stack.from_top(y), stack.top());
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -403,7 +401,7 @@ int exec_pick(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute PICK\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow_p(x);
|
||||
stack.push(stack.fetch(x));
|
||||
return 0;
|
||||
|
|
@ -413,8 +411,9 @@ int exec_roll(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute ROLL\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow_p(x);
|
||||
st->consume_gas(std::max(x - 255, 0));
|
||||
while (--x >= 0) {
|
||||
swap(stack[x], stack[x + 1]);
|
||||
}
|
||||
|
|
@ -425,8 +424,9 @@ int exec_rollrev(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute ROLLREV\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow_p(x);
|
||||
st->consume_gas(std::max(x - 255, 0));
|
||||
for (int i = 0; i < x; i++) {
|
||||
swap(stack[i], stack[i + 1]);
|
||||
}
|
||||
|
|
@ -437,13 +437,14 @@ int exec_blkswap_x(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute BLKSWX\n";
|
||||
stack.check_underflow(2);
|
||||
int y = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int y = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow(x + y);
|
||||
if (x > 0 && y > 0) {
|
||||
std::reverse(stack.from_top(x + y), stack.from_top(y));
|
||||
std::reverse(stack.from_top(y), stack.top());
|
||||
std::reverse(stack.from_top(x + y), stack.top());
|
||||
if (st->get_global_version() >= 4) {
|
||||
st->consume_gas(std::max(x + y - 255, 0));
|
||||
}
|
||||
std::rotate(stack.from_top(x + y), stack.from_top(y), stack.top());
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -452,9 +453,10 @@ int exec_reverse_x(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute REVX\n";
|
||||
stack.check_underflow(2);
|
||||
int y = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int y = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow(x + y);
|
||||
st->consume_gas(std::max(x - 255, 0));
|
||||
std::reverse(stack.from_top(x + y), stack.from_top(y));
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -463,7 +465,7 @@ int exec_drop_x(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute DROPX\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow(x);
|
||||
stack.pop_many(x);
|
||||
return 0;
|
||||
|
|
@ -482,7 +484,7 @@ int exec_xchg_x(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute XCHGX\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow_p(x);
|
||||
swap(stack[0], stack[x]);
|
||||
return 0;
|
||||
|
|
@ -499,7 +501,7 @@ int exec_chkdepth(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute CHKDEPTH\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow(x);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -508,10 +510,11 @@ int exec_onlytop_x(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute ONLYTOPX\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow(x);
|
||||
int n = stack.depth(), d = n - x;
|
||||
if (d > 0) {
|
||||
st->consume_gas(std::max(x - 255, 0));
|
||||
for (int i = n - 1; i >= d; i--) {
|
||||
stack[i] = std::move(stack[i - d]);
|
||||
}
|
||||
|
|
@ -524,7 +527,7 @@ int exec_only_x(VmState* st) {
|
|||
Stack& stack = st->get_stack();
|
||||
VM_LOG(st) << "execute ONLYX\n";
|
||||
stack.check_underflow(1);
|
||||
int x = stack.pop_smallint_range(255);
|
||||
int x = stack.pop_smallint_range(st->get_global_version() >= 4 ? (1 << 30) - 1 : 255);
|
||||
stack.check_underflow(x);
|
||||
stack.pop_many(stack.depth() - x);
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue