@layerzerolabs/layerzero-v2-ton 3.0.59 → 3.0.60

package/src/protocol/msglibs/ultralightnode/ulnConnection/storage.fc

@@ -30,7 +30,7 @@ const int UlnConnection::hashLookups = 8; ;; map nonce -> map dvnAddress -> {has
 const int UlnConnection::commitPOOO = 9;
 
 ;; @owner ulnManager
-cell UlnConnection::New(int owner, cell $path, int ulnAddress) method_id {
+cell UlnConnection::New(int owner, cell $path, int ulnAddress) impure method_id {
     return cl::declare(
         UlnConnection::NAME,
         unsafeTuple([

package/src/protocol/msglibs/ultralightnode/ulnManager/storage.fc

@@ -25,7 +25,7 @@ cell UlnManager::New(
     cell connectionCode,
     int controllerAddress,
     int eid
-) method_id {
+) impure inline method_id {
     return cl::declare(
         UlnManager::NAME,
         unsafeTuple([

package/src/protocol/msglibs/ultralightnode/workerFeeLibs/dvnFeeLib/handler.fc

@@ -53,7 +53,7 @@ int _getCallDataSize(cell $myStorage) impure inline_ref {
     return DvnFeelib::EXECUTE_FIXED_BYTES + DvnFeelib::VERIFY_BYTES_ULN + totalSignatureBytes + 32;
 }
 
-tuple ulnWorker::quote(tuple inputs) method_id {
+tuple ulnWorker::quote(tuple inputs) impure method_id {
     cell $myStorage = inputs.cell_at(0);
     cell $priceFeedInfo = inputs.cell_at(1);
     ;; cell $path = inputs.cell_at(2);

package/src/protocol/msglibs/ultralightnode/workerFeeLibs/dvnFeeLib/storage.fc

@@ -15,7 +15,7 @@ cell DvnFeelib::New(
     int remoteGas,
     int multiplierBps,
     int floorMarginUSD
-) method_id {
+) impure inline method_id {
     return cl::declare(
         DvnFeelib::NAME,
         unsafeTuple([

package/src/protocol/msglibs/ultralightnode/workerFeeLibs/executorFeeLib/handler.fc

@@ -16,7 +16,7 @@ int isV1Eid(int eid) impure inline {
     return (eid < 30000);
 }
 
-(int, int) _decodeOption(int lzReceiveBaseGas, int lzComposeBaseGas, cell $options, cell $path) impure inline {
+(int, int) _decodeOption(int lzComposeBaseGas, cell $options, cell $path) impure inline {
     int totalGas = 0;
     int totalDstAmount = 0;
 
@@ -35,7 +35,7 @@ int isV1Eid(int eid) impure inline {
             (lzReceiveValue > 0) & isV1Eid($path.lz::Path::getDstEid())
         );
 
-        totalGas += lzReceiveBaseGas + lzReceiveGas;
+        totalGas += lzReceiveGas;
 
         totalDstAmount += lzReceiveValue + nativeDropAmount;
 
@@ -53,7 +53,7 @@ int isV1Eid(int eid) impure inline {
             (lzComposeGas == 0) & (lzComposeValue > 0)
         );
 
-        totalGas += lzReceiveBaseGas + lzReceiveGas;
+        totalGas += lzReceiveGas;
 
         totalDstAmount += lzReceiveValue + nativeDropAmount;
 
@@ -83,7 +83,6 @@ int isV1Eid(int eid) impure inline {
 
     ifnot ($extraOptions.cl::isNullObject()) {
         (int _totalGas, int _totalDstAmount) = _decodeOption(
-            lzReceiveBaseGas,
             lzComposeBaseGas,
             $extraOptions,
             $path
@@ -95,7 +94,6 @@ int isV1Eid(int eid) impure inline {
 
     ifnot ($enforcedOptions.cl::isNullObject()) {
         (int _totalGas, int _totalDstAmount) = _decodeOption(
-            lzReceiveBaseGas,
             lzComposeBaseGas,
             $enforcedOptions,
             $path
@@ -104,7 +102,7 @@ int isV1Eid(int eid) impure inline {
         totalDstAmount += _totalDstAmount;
     }
 
-    return (totalGas, totalDstAmount);
+    return (totalGas + lzReceiveBaseGas, totalDstAmount);
 }
 
 ;; current gas consumed: 16276

package/src/protocol/msglibs/ultralightnode/workerFeeLibs/executorFeeLib/storage.fc

@@ -15,7 +15,7 @@ cell ExecutorFeelib::New(
     int floorMarginUSD,
     int nativeCap,
     int lzComposeBaseGas
-) method_id {
+) impure inline method_id {
     return cl::declare(
         ExecutorFeelib::NAME,
         unsafeTuple([

package/src/protocol/msglibs/ultralightnode/workerFeeLibs/maliciousFeeLib/handler.fc

@@ -1,6 +1,6 @@
 #include "../../../../../funC++/utils.fc";
 
-tuple ulnWorker::quote(tuple inputs) method_id {
+tuple ulnWorker::quote(tuple inputs) impure method_id {
     int x = 0;
     while (true) {
         x += 1;

package/src/protocol/msglibs/ultralightnode/workerFeeLibs/priceFeedFeeLib/storage.fc

@@ -20,7 +20,7 @@ cell PriceFeedFeelib::New(
     int nativePriceUsd,
     cell arbitrumExtension,
     cell optimismExtension
-) method_id {
+) impure method_id {
     return cl::declare(
         PriceFeedFeelib::NAME,
         unsafeTuple([

package/src/workers/core/abstract/workerHandler.fc

@@ -104,14 +104,15 @@ tuple _claimTon(tuple actions, cell $claimTon) impure {
 }
 
 tuple _claimTonFromProxy(tuple actions, cell $claimTon) impure {
-    actions~pushAction<call>(
-        getProxyAddress(),
-        Worker::OP::CLAIM_TON,
+    ;; event needs to be emitted before the call because call is a terminal action
+    actions~pushAction<event>(
+        Worker::event::CLAIMED_TON_FROM_PROXY,
         $claimTon
     );
 
-    actions~pushAction<event>(
-        Worker::event::CLAIMED_TON_FROM_PROXY,
+    actions~pushAction<call>(
+        getProxyAddress(),
+        Worker::OP::CLAIM_TON,
         $claimTon
     );
 

package/src/workers/core/workerCoreStorage.fc

@@ -20,7 +20,7 @@ const int WorkerCoreStorage::version = 2;
 ;; a context-free way to refer to the two ends of the channel.
 ;; The direction is inferred by the context of the contract (send vs receive).
 ;; The srcOApp is the 256-bit hashpart of a standard address.
-cell WorkerCoreStorage::New(cell admins, int proxy, int version) inline method_id {
+cell WorkerCoreStorage::New(cell admins, int proxy, int version) impure inline method_id {
     return cl::declare(
         WorkerCoreStorage::NAME,
         unsafeTuple([

package/src/workers/dvn/handler.fc

@@ -46,7 +46,7 @@
 }
 
 ;;; Encodes [uint256 x1, uint256 x2] into a cell which represents the 64-byte public key
-cell encodePublicKey(int x1, int x2) inline method_id {
+cell encodePublicKey(int x1, int x2) impure inline method_id {
     return begin_cell()
         .store_uint256(x1)
         .store_uint256(x2)
@@ -385,8 +385,8 @@ tuple setAdmins(cell $addressList) impure inline {
     return _setAdmins(emptyActions(), $addressList);
 }
 
-tuple claimTon(cell $coinsAmount) impure inline {
-    return _claimTon(emptyActions(), $coinsAmount);
+tuple claimTon(cell $claimTon) impure inline {
+    return _claimTon(emptyActions(), $claimTon);
 }
 
 tuple claimTonFromProxy(cell $claimTon) impure inline {

package/src/workers/dvn/storage.fc

@@ -12,7 +12,7 @@ const int Dvn::setVerifiersNonce = 4;
 const int Dvn::setAdminsByQuorumNonce = 5;
 
 ;; @owner manager
-cell Dvn::New(cell admins, int version, int quorum, cell verifiers) method_id {
+cell Dvn::New(cell admins, int version, int quorum, cell verifiers) impure inline method_id {
     return cl::declare(
         Dvn::NAME,
         unsafeTuple([

package/src/workers/executor/handler.fc

@@ -65,13 +65,25 @@ tuple _executorNativeDrop(tuple actions, cell $mdNativeDrop) impure inline {
 tuple _executorLzReceivePrepare(tuple actions, cell $executeParams) impure inline {
     int opcode = $executeParams.md::ExecuteParams::getOpcode();
     throw_unless(
-        Worker::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidOpcode,
         opcode == Channel::OP::LZ_RECEIVE_PREPARE
     );
 
     return _callContract(actions, $executeParams);
 }
 
+tuple executorCommitPacket(cell $executeParams) impure inline {
+    tuple actions = emptyActions();
+    int opcode = $executeParams.md::ExecuteParams::getOpcode();
+
+    throw_unless(
+        Worker::ERROR::invalidOpcode,
+        opcode == Uln::OP::ULN_COMMIT_PACKET
+    );
+
+    return _callContract(actions, $executeParams);
+}
+
 tuple executorNativeDrop(cell $mdNativeDrop) impure inline {
     return _executorNativeDrop(emptyActions(), $mdNativeDrop);
 }
@@ -84,13 +96,13 @@ tuple executorLzReceivePrepare(cell $executeParams) impure inline {
 ;; obj: $executeParams for lzReceivePrepare
 tuple executorNativeDropAndLzReceivePrepare(cell $mdObj) impure inline {
     (
-        cell $lzReceivePrepareMd,
+        cell $executeParams,
         cell $nativeDropMd
     ) = $mdObj.md::MdObj::deserialize();
     
     return emptyActions()
         ._executorNativeDrop($nativeDropMd)
-        ._executorLzReceivePrepare($lzReceivePrepareMd);
+        ._executorLzReceivePrepare($executeParams);
 }
 
 tuple executorLzReceiveAlert(cell $executeParams) impure inline {
@@ -98,7 +110,7 @@ tuple executorLzReceiveAlert(cell $executeParams) impure inline {
 
     int opcode = $executeParams.md::ExecuteParams::getOpcode();
     throw_unless(
-        Worker::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidOpcode,
         opcode == Channel::OP::EMIT_LZ_RECEIVE_ALERT
     );
 

package/src/workers/executor/interface.fc

@@ -6,6 +6,8 @@ const int Executor::OP::NATIVE_DROP = "Executor::OP::NATIVE_DROP"c;
 
 const int Executor::OP::LZ_RECEIVE_PREPARE = "Executor::OP::LZ_RECEIVE_PREPARE"c;
 
+const int Executor::OP::COMMIT_PACKET = "Executor::OP::COMMIT_PACKET"c;
+
 ;; Native drop a batch of native tokens and execute a packet
 const int Executor::OP::NATIVE_DROP_AND_LZ_RECEIVE_PREPARE = "Executor::OP::NATIVE_DROP_AND_LZ_RECEIVE_PREPARE"c;
 

package/src/workers/executor/main.fc

@@ -8,6 +8,8 @@ tuple _executeOpcode(int op, cell $md) impure inline {
         return executorNativeDrop($md);
     } elseif (op == Executor::OP::NATIVE_DROP_AND_LZ_RECEIVE_PREPARE) {
         return executorNativeDropAndLzReceivePrepare($md);
+    } elseif (op == Executor::OP::LZ_RECEIVE_PREPARE) {
+        return executorLzReceivePrepare($md);
     } elseif (op == Executor::OP::LZ_RECEIVE_ALERT) {
         return executorLzReceiveAlert($md);
     } elseif (op == Worker::OP::SET_ADMINS) {
@@ -24,6 +26,8 @@ tuple _executeOpcode(int op, cell $md) impure inline {
         return emptyActions();
     } elseif (op == Executor::OP::SET_NATIVE_DROP_TOTAL_CAP) {
         return setNativeDropTotalCap($md);
+    } elseif (op == Executor::OP::COMMIT_PACKET) {
+        return executorCommitPacket($md);
     }
     throw(BaseInterface::ERROR::invalidOpcode);
     return empty_tuple();

package/src/workers/executor/storage.fc

@@ -8,7 +8,7 @@ const int Executor::workerCoreStorage = 0;   ;; = WORKER_CORE_STORAGE_IDX
 const int Executor::nativeDropTotalCap = 1;
 
 ;; @owner manager
-cell Executor::New(cell admins, int version, int nativeDropTotalCap) method_id {
+cell Executor::New(cell admins, int version, int nativeDropTotalCap) impure inline method_id {
     return cl::declare(
         Executor::NAME,
         unsafeTuple([

package/src/workers/msgdata/ClaimTon.fc

@@ -7,7 +7,7 @@ const int md::ClaimTon::NAME = "claimTon"u;
 const int md::ClaimTon::amount = 0;
 const int md::ClaimTon::target = 1;
 
-cell md::ClaimTon::New(int amount, int target) inline method_id {
+cell md::ClaimTon::New(int amount, int target) impure inline method_id {
     return cl::declare(
         md::ClaimTon::NAME,
         unsafeTuple([

package/src/workers/msgdata/ExecuteParams.fc

@@ -23,20 +23,20 @@ cell md::ExecuteParams::New(
     int expiration,
     int opcode,
     int forwardingAddress
-) method_id {
+) impure inline method_id {
     return cl::declare(
         md::ExecuteParams::NAME,
         unsafeTuple([
-            [cl::t::address, target],             ;; md::ExecuteParams::target
-            [cl::t::objRef, callData],            ;; md::ExecuteParams::callData
-            [cl::t::uint64, expiration],          ;; md::ExecuteParams::expiration
-            [cl::t::uint32, opcode],              ;; md::ExecuteParams::opcode
+            [cl::t::address, target],              ;; md::ExecuteParams::target
+            [cl::t::objRef, callData],             ;; md::ExecuteParams::callData
+            [cl::t::uint64, expiration],           ;; md::ExecuteParams::expiration
+            [cl::t::uint32, opcode],               ;; md::ExecuteParams::opcode
             [cl::t::address, forwardingAddress]    ;; md::ExecuteParams::forwardingAddress
         ])
     );
 }
 
-;; ========================== Object Builders=====================================
+;; ========================== Object Builders===========================w==========
 
 const int md::ExecuteParams::_headerInfoBits = _BASIC_HEADER_WIDTH + (_FIELD_INFO_WIDTH * 5);
 const int md::ExecuteParams::_headerFillerBits = _HEADER_WIDTH - md::ExecuteParams::_headerInfoBits;
@@ -47,7 +47,7 @@ cell md::ExecuteParams::build(
     int expiration,
     int opcode,
     int forwardingAddress
-) inline {
+) impure inline {
     return begin_cell()
         .store_uint(593196021158614130743421175296147950525415477349115, md::ExecuteParams::_headerInfoBits)
         .store_ones(md::ExecuteParams::_headerFillerBits)

package/src/workers/msgdata/NativeDrop.fc

@@ -8,7 +8,7 @@ const int md::NativeDrop::payees = 0;
 const int md::NativeDrop::packetId = 1;
 const int md::NativeDrop::msglib = 2;
 
-cell md::NativeDrop::New(cell payees, cell $packetId, int msglib) inline method_id {
+cell md::NativeDrop::New(cell payees, cell $packetId, int msglib) impure inline method_id {
     return cl::declare(
         md::NativeDrop::NAME,
         unsafeTuple([   

package/src/workers/msgdata/SetDict.fc

@@ -9,7 +9,7 @@ const int md::SetDict::opcode = 1;
 const int md::SetDict::dict = 2;
 const int md::SetDict::target = 3;
 
-cell md::SetDict::New(int nonce, int opcode, cell _dict, int target) inline method_id {
+cell md::SetDict::New(int nonce, int opcode, cell _dict, int target) impure inline method_id {
     return cl::declare(
         md::SetDict::NAME,
         unsafeTuple([

package/src/workers/msgdata/SetQuorum.fc

@@ -9,7 +9,7 @@ const int md::SetQuorum::opcode = 1;
 const int md::SetQuorum::quorum = 2;
 const int md::SetQuorum::target = 3;
 
-cell md::SetQuorum::New(int nonce, int opcode, int quorum, int target) inline method_id {
+cell md::SetQuorum::New(int nonce, int opcode, int quorum, int target) impure inline method_id {
     return cl::declare(
         md::SetQuorum::NAME,
         unsafeTuple([

package/src/workers/msgdata/SignedRequest.fc

@@ -7,7 +7,7 @@ const int md::SignedRequest::NAME = "sgndReq"u;
 const int md::SignedRequest::request = 0;
 const int md::SignedRequest::signatures = 1;
 
-cell md::SignedRequest::New(cell $request, cell signatures) method_id {
+cell md::SignedRequest::New(cell $request, cell signatures) impure inline method_id {
     return cl::declare(
         md::SignedRequest::NAME,
         unsafeTuple([

package/src/workers/priceFeedCache/storage.fc

@@ -13,7 +13,7 @@ const int PriceFeedCache::priceFeedFeeLibStorage = 1;
 const int PriceFeedCache::dstEid = 2; ;; sharding key, unused in actual logic
 
 ;; @owner manager
-cell PriceFeedCache::New(cell admins, int version, cell $priceFeedFeeLib, int dstEid) method_id {
+cell PriceFeedCache::New(cell admins, int version, cell $priceFeedFeeLib, int dstEid) impure inline method_id {
     return cl::declare(
         PriceFeedCache::NAME,
         unsafeTuple([

package/src/workers/proxy/handler.fc

@@ -11,22 +11,12 @@
 
 ;;; ==========================PERMISSION FUNCTIONS=================================
 
-() assertLatestAdmin() impure inline {
-    throw_unless(
-        Proxy::ERROR::NOT_LATEST_ADMIN,
-        getCaller() == getLatestAdmin()
-    );
-}
-
 ;; this is special in proxy, only the people in the address book can call 'callContract'
 () _checkPermissions(int op, cell $md) impure inline {
     if (
-        (op == Proxy::OP::CALL_CONTRACT)
-        | (op == Proxy::OP::EMIT_EVENT)
-    ) {
-        return assertLatestAdmin();
-    } elseif (
         (op == Worker::OP::SET_ADMINS)
+        | (op == Proxy::OP::CALL_CONTRACT)
+        | (op == Proxy::OP::EMIT_EVENT)
         | (op == Worker::OP::CLAIM_TON)
         | (op == Proxy::OP::TOGGLE_CALLBACK)
     ) {

package/src/workers/proxy/storage.fc

@@ -10,7 +10,7 @@ const int Proxy::workerCoreStorage = 0; ;; = WORKER_CORE_STORAGE_IDX
 const int Proxy::callbackEnabled = 1;
 
 ;; @owner manager
-cell Proxy::New(cell admins, int version) method_id {
+cell Proxy::New(cell admins, int version) impure inline method_id {
     return cl::declare(
         Proxy::NAME,
         unsafeTuple([

package/tests/baseContractTest.fc

@@ -70,6 +70,7 @@ cell baseTest::prepare(tuple args) impure {
 
     ;; Check that each action matches the expected action
     int index = 1;
+    int terminalActionEncountered = false;
     tuple terminalIndices = empty_tuple();
     while (index < numActions) {
         tuple actualAction = actions.tuple_at(index);
@@ -79,13 +80,16 @@ cell baseTest::prepare(tuple args) impure {
         }
         int actionType = actualAction.int_at(0);
         int equal = false;
+        int isCurrentActionTerminal = false;
 
         if (actionType == action::deploy::NAME) {
             terminalIndices = terminalIndices.tpush(index);
             equal = action::deploy::equals(actualAction, expectedAction);
+            isCurrentActionTerminal = true;
         } elseif (actionType == action::call::NAME) {
             terminalIndices = terminalIndices.tpush(index);
             equal = action::call::equals(actualAction, expectedAction);
+            isCurrentActionTerminal = true;
         } elseif (actionType == action::dispatch::NAME) {
             equal = action::dispatch::equals(actualAction, expectedAction);
         } elseif (actionType == action::payment::NAME) {
@@ -94,13 +98,19 @@ cell baseTest::prepare(tuple args) impure {
             equal = action::event::equals(actualAction, expectedAction);
         } elseif (actionType == action::sendJettons::NAME) {
             equal = action::sendJettons::equals(actualAction, expectedAction);
+            isCurrentActionTerminal = true;
         } elseif (actionType == action::rawCall::NAME) {
             equal = action::rawCall::equals(actualAction, expectedAction);
+            isCurrentActionTerminal = true;
         }
         ifnot (equal) {
             test::throwError("action incorrect: ".str::concatInt(index));
         }
+        if (terminalActionEncountered & (~ isCurrentActionTerminal)) { 
+            test::throwError("terminal before non-terminal: ".str::concatInt(index));
+        }
         index += 1;
+        terminalActionEncountered = terminalActionEncountered | isCurrentActionTerminal;
     }
     if (terminalIndices.tlen() > 1) {
         test::throwError("Multiple terminal actions");

package/src/classes/lz/Worker.fc

@@ -1,32 +0,0 @@
-#include "../../funC++/classlib.fc";
-
-;; required storage name
-const int lz::Worker::NAME = "Worker"u;
-
-;; field names
-const int lz::Worker::owner = 0; ;; key
-;; allowlist of workers who are allowed to view my storage
-const int lz::Worker::viewAllowlist = 1;
-;; list of workers whose storage I depend on
-const int lz::Worker::viewDependencies = 2;
-const int lz::Worker::bytecodeLibrary = 3; ;; library cell
-const int lz::Worker::storage = 4;
-
-;; In all blockchains with atomic cross-contract call, we can use src/dst/sender/receiver
-;; because the send channel doesn't exist (it's just a nonce).
-;; In TON, we need both send/receive channels, so we use local/remote to provide
-;; a context-free way to refer to the two ends of the channel.
-;; The direction is inferred by the context of the contract (send vs receive).
-;; The srcOApp is the 256-bit hashpart of a standard address.
-cell lz::Worker::New(int owner, int priceFeedAddress, cell bytecode, cell $storage) inline method_id {
-    return cl::declare(
-        lz::Worker::NAME,
-        unsafeTuple([
-            [cl::t::address, owner],                ;; lz::Worker::owner
-            [cl::t::dict256, cl::dict256::New()],   ;; lz::Worker::viewAllowlist
-            [cl::t::dict256, cl::dict256::New()],   ;; lz::Worker::viewDependencies
-            [cl::t::cellRef, bytecode],             ;; lz::Worker::bytecodeLibrary
-            [cl::t::objRef, $storage]               ;; lz::Worker::storage
-        ])
-    );
-}