@layerzerolabs/layerzero-v2-ton 3.0.22-ton.2 → 3.0.24

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

@@ -36,7 +36,7 @@
             totalGas += lzComposeGas + lzComposeBaseGas;
             totalDstAmount += lzComposeValue;
         }
-    } elseif (cl::isNull($options)) {
+    } elseif (cl::isNullObject($options)) {
         return (0, 0);
     } else {
         throw(UlnWorkerInterface::ERROR::UNKNOWN_OPTIONS);
@@ -54,13 +54,13 @@
     int totalGas = 0;
     int totalDstAmount = 0;
 
-    ifnot ($extraOptions.cl::isNull()) {
+    ifnot ($extraOptions.cl::isNullObject()) {
         (int _totalGas, int _totalDstAmount) = _decodeOption(lzReceiveBaseGas, lzComposeBaseGas, $extraOptions);
         totalGas += _totalGas;
         totalDstAmount += _totalDstAmount;
     }
 
-    ifnot ($enforcedOptions.cl::isNull()) {
+    ifnot ($enforcedOptions.cl::isNullObject()) {
         (int _totalGas, int _totalDstAmount) = _decodeOption(lzReceiveBaseGas, lzComposeBaseGas, $enforcedOptions);
         totalGas += _totalGas;
         totalDstAmount += _totalDstAmount;

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

@@ -122,7 +122,7 @@ tuple _callViaProxy(tuple actions, cell $executeParams) impure {
     ;; only these opcodes are allowed to be called from the worker to the proxy
     int opcode = $executeParams.cl::get<uint32>(md::ExecuteParams::opcode);
     throw_unless(
-        Worker::ERROR::DISALLOWED_INNER_OPCODE, 
+        Worker::ERROR::invalidSignedOpcode, 
         (opcode == Uln::OP::UPDATE_WORKER_FEELIB)
         | (opcode == Uln::OP::DEREGISTER_WORKER_FEELIB)
         | (opcode == UlnManager::OP::ADD_ULN_WORKER)

package/src/workers/core/interface.fc

@@ -18,8 +18,8 @@ const int Worker::OP::SET_ADMINS = "Worker::OP::SET_ADMINS"c;
 const int Worker::ERROR::onlyAdmin = 2015;
 const int Worker::ERROR::invalidOpcode = 2014;
 
-const int Worker::ERROR::DISALLOWED_INNER_OPCODE = 2013;
-const int Worker::ERROR::DISALLOWED_INNER_TARGET = 2012;
+const int Worker::ERROR::invalidSignedOpcode = 2013;
+const int Worker::ERROR::invalidInnerTarget = 2012;
 
 ;;; ==========================EVENTS=====================================
 const int Worker::event::ADMINS_SET = "Worker::event::ADMINS_SET"u;

package/src/workers/dvn/handler.fc

@@ -106,6 +106,7 @@ tuple _verifySignatures(tuple actions, int hash, cell signatures, cell verifiers
         | (op == Worker::OP::SET_PROXY)
         | (op == Worker::OP::CLAIM_TON)
         | (op == Worker::OP::CALL_VIA_PROXY)
+        | (op == Dvn::OP::SET_PROXY_ADMINS)
     ) {
         return assertAdmin();
     } elseif (op == Proxy::OP::HANDLE_CALLBACK) {
@@ -120,17 +121,23 @@ tuple setVerifiers(cell $signedRequest) impure {
     (cell $storage, tuple actions) = preamble();
 
     cell $setDict = $signedRequest.cl::get<objRef>(md::SignedRequest::request);
+    cell $newVerifiers = $setDict.cl::get<dict256>(md::SetDict::dict);
+
+    throw_if(
+        Dvn::ERROR::invalidVerifiers,
+        cl::dict256::size($newVerifiers) < 1
+    );
 
     int incomingNonce = $setDict.cl::get<uint64>(md::SetDict::nonce);
 
     throw_if(
-        Dvn::ERROR::invalidsetVerifiersNonce,
+        Dvn::ERROR::invalidRequestNonce,
         incomingNonce != $storage.cl::get<uint64>(Dvn::setVerifiersNonce)
     );
     
     int opcode = $setDict.cl::get<uint64>(md::SetDict::opcode);
     throw_if(
-        Dvn::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidSignedOpcode,
         opcode != Dvn::OP::SET_VERIFIERS
     );
 
@@ -144,10 +151,7 @@ tuple setVerifiers(cell $signedRequest) impure {
 
     setContractStorage(
         $storage
-            .cl::set(
-                Dvn::verifiers,
-                $setDict.cl::get<dict256>(md::SetDict::dict)
-            )
+            .cl::set(Dvn::verifiers, $newVerifiers)
             .cl::set(Dvn::setVerifiersNonce, incomingNonce + 1)
     );
 
@@ -164,21 +168,22 @@ tuple setQuorum(cell $signedRequest) impure {
     int incomingNonce = $setQuorum.cl::get<uint64>(md::SetQuorum::nonce);
 
     throw_if(
-        Dvn::ERROR::invalidsetQuorumNonce,
+        Dvn::ERROR::invalidRequestNonce,
         incomingNonce != $storage.cl::get<uint64>(Dvn::setQuorumNonce)
     );
 
     int opcode = $setQuorum.cl::get<uint64>(md::SetQuorum::opcode);
     throw_if(
-        Dvn::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidSignedOpcode,
         opcode != Dvn::OP::SET_QUORUM
     );
 
     int newQuorum = $setQuorum.cl::get<uint64>(md::SetQuorum::quorum);
+    cell $verifiers = $storage.cl::get<dict256>(Dvn::verifiers);
 
     throw_if(
         Dvn::ERROR::invalidQuorum,
-        newQuorum < 1
+        (newQuorum < 1) | (newQuorum > cl::dict256::size($verifiers))
     );
 
     actions = _verifySignatures(
@@ -208,13 +213,13 @@ tuple setAdminsByQuorum(cell $signedRequest) impure {
     int incomingNonce = $setDict.cl::get<uint64>(md::SetDict::nonce);
 
     throw_if(
-        Dvn::ERROR::invalidsetAdminsByQuorumNonce,
+        Dvn::ERROR::invalidRequestNonce,
         incomingNonce != $storage.cl::get<uint64>(Dvn::setAdminsByQuorumNonce)
     );
 
     int opcode = $setDict.cl::get<uint64>(md::SetDict::opcode);
     throw_if(
-        Dvn::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidSignedOpcode,
         opcode != Dvn::OP::SET_ADMINS_BY_QUORUM
     );
 
@@ -256,7 +261,7 @@ tuple verify(cell $signedRequest) impure inline {
 
     int opcode = $executeParams.cl::get<uint32>(md::ExecuteParams::opcode);
     throw_if(
-        Dvn::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidSignedOpcode,
         opcode != Uln::OP::ULN_VERIFY
     );
 
@@ -297,10 +302,22 @@ tuple setProxyAdmins(cell $signedRequest) impure inline {
 
     int opcode = $executeParams.cl::get<uint32>(md::ExecuteParams::opcode);
     throw_if(
-        Dvn::ERROR::invalidSignedOpcode,
+        Worker::ERROR::invalidSignedOpcode,
         opcode != Worker::OP::SET_ADMINS
     );
 
+    int target = $executeParams.cl::get<address>(md::ExecuteParams::target);
+    throw_if(
+        Worker::ERROR::invalidInnerTarget,
+        target != getProxyAddress()
+    );
+
+    cell $newAdminList = $executeParams.cl::get<objRef>(md::ExecuteParams::callData);
+    throw_if(
+        Dvn::ERROR::invalidProxyAdmins,
+        AddressList::length($newAdminList) != 1
+    );
+
     actions = _verifySignatures(
         actions,
         $executeParams.cl::hash(),

package/src/workers/dvn/interface.fc

@@ -10,12 +10,10 @@ const int Dvn::OP::SET_PROXY_ADMINS = "Dvn::OP::SET_PROXY_ADMINS"c;
 const int Dvn::ERROR::expired = 1983;
 const int Dvn::ERROR::quorumNotMet = 1982;
 const int Dvn::ERROR::notEnoughSignatures = 1981;
-const int Dvn::ERROR::invalidsetQuorumNonce = 1980;
-const int Dvn::ERROR::invalidQuorum = 1979;
-const int Dvn::ERROR::invalidsetAdminsByQuorumNonce = 1978;
-
-const int Dvn::ERROR::invalidsetVerifiersNonce = 1977;
-const int Dvn::ERROR::invalidSignedOpcode = 1976;
+const int Dvn::ERROR::invalidQuorum = 1980;
+const int Dvn::ERROR::invalidRequestNonce = 1979;
+const int Dvn::ERROR::invalidVerifiers = 1978;
+const int Dvn::ERROR::invalidProxyAdmins = 1977;
 
 ;;; ==========================EVENTS=====================================
 const int Dvn::event::INVALID_SIGNATURE = "Dvn::event::INVALID_SIGNATURE"u;

package/src/workers/dvn/storage.fc

@@ -16,12 +16,12 @@ cell Dvn::New(cell admins, int version, int quorum, cell verifiers) method_id {
     return cl::declare(
         Dvn::NAME,
         unsafeTuple([
-            [cl::t::objRef, WorkerCoreStorage::New(admins, NULLADDRESS, version)], ;; Dvn::workerCoreStorage
-            [cl::t::uint64, quorum],                                    ;; Dvn::quorum
-            [cl::t::dict256, verifiers],                                ;; Dvn::verifiers
-            [cl::t::uint64, 1],                                         ;; Dvn::setQuorumNonce
-            [cl::t::uint64, 1],                                         ;; Dvn::setVerifiersNonce
-            [cl::t::uint64, 1]                                         ;; Dvn::setAdminsByQuorumNonce
+            [cl::t::objRef, WorkerCoreStorage::New(admins, NULLADDRESS, version)],     ;; Dvn::workerCoreStorage
+            [cl::t::uint64, quorum],                                                   ;; Dvn::quorum
+            [cl::t::dict256, verifiers],                                               ;; Dvn::verifiers
+            [cl::t::uint64, 1],                                                        ;; Dvn::setQuorumNonce
+            [cl::t::uint64, 1],                                                        ;; Dvn::setVerifiersNonce
+            [cl::t::uint64, 1]                                                        ;; Dvn::setAdminsByQuorumNonce
         ])
     );
 }

package/src/workers/executor/handler.fc

@@ -55,7 +55,7 @@ tuple _executorNativeDrop(tuple actions, cell $mdNativeDrop) impure inline {
 tuple _executorLzReceivePrepare(tuple actions, cell $executeParams) impure inline {
     int opcode = $executeParams.cl::get<uint32>(md::ExecuteParams::opcode);
     throw_unless(
-        Worker::ERROR::DISALLOWED_INNER_OPCODE,
+        Worker::ERROR::invalidSignedOpcode,
         opcode == Channel::OP::LZ_RECEIVE_PREPARE
     );
 
@@ -83,7 +83,7 @@ tuple executorLzReceiveAlert(cell $executeParams) impure inline {
 
     int opcode = $executeParams.cl::get<uint32>(md::ExecuteParams::opcode);
     throw_unless(
-        Worker::ERROR::DISALLOWED_INNER_OPCODE,
+        Worker::ERROR::invalidSignedOpcode,
         opcode == Channel::OP::EMIT_LZ_RECEIVE_ALERT
     );
 

package/src/workers/priceFeedCache/main.fc

@@ -22,4 +22,4 @@ tuple _executeOpcode(int op, cell $md) impure inline {
     }
     throw(BaseInterface::ERROR::invalidOpcode);
     return empty_tuple();
-}
+}

package/src/workers/proxy/handler.fc

@@ -4,8 +4,6 @@
 #include "../../classes/msgdata/MdAddress.fc";
 #include "../../classes/msgdata/Bool.fc";
 
-#include "../msgdata/ProxyMessage.fc";
-
 #include "../../protocol/msglibs/ultralightnode/uln/interface.fc";
 
 #include "./interface.fc";

package/src/workers/msgdata/ProxyMessage.fc

@@ -1,20 +0,0 @@
-#include "../../funC++/classlib.fc";
-
-;; required storage name
-const int md::ProxyMessage::NAME = "ProxyMsg"u;
-
-;; field names
-const int md::ProxyMessage::destination = 0;
-const int md::ProxyMessage::opcode = 1;
-const int md::ProxyMessage::data = 2;
-
-cell md::ProxyMessage::New(int destination, int opcode, cell data) method_id {
-    return cl::declare(
-        md::ProxyMessage::NAME,
-        unsafeTuple([
-            [cl::t::address, destination],  ;; md::ProxyMessage::destination
-            [cl::t::uint32, opcode],        ;; md::ProxyMessage::opcode
-            [cl::t::dict256, data]          ;; md::ProxyMessage::data
-        ])
-    );
-}