@layerzerolabs/layerzero-v2-ton 3.0.44 → 3.0.46

package/src/protocol/channel/handler.fc

@@ -341,7 +341,7 @@ tuple channelSend(cell $mdObj) impure inline method_id {
 
     if ((sendMsglibManager == NULLADDRESS) | (sendMsglib == NULLADDRESS) | (sendMsglibConnection == NULLADDRESS)) {
         actions~pushAction<call>(
-            $sendPath.lz::Path::getSrcOApp(),
+            $sendPath.lz::Path::getSrcOApp(), ;; the OApp on this chain
             Layerzero::OP::CHANNEL_SEND_CALLBACK,
             md::MdObj::New(
                 md::MessagingReceipt::New(
@@ -392,7 +392,7 @@ tuple channelSend(cell $mdObj) impure inline method_id {
         ;; callback to the oApp with a failure and emit an event
         actions~pushAction<event>(Channel::ERROR::sendQueueCongested, $lzSend);
         actions~pushAction<call>(
-            $sendPath.lz::Path::getSrcOApp(),
+            $sendPath.lz::Path::getSrcOApp(), ;; the OApp on this chain
             Layerzero::OP::CHANNEL_SEND_CALLBACK,
             md::MdObj::New(
                 md::MessagingReceipt::New($lzSend, 0, 0, Channel::ERROR::sendQueueCongested),
@@ -555,7 +555,7 @@ tuple msglibSendCallback(cell $mdMsglibSendCallback) impure inline method_id {
     setContractStorage($storage);
 
     actions~pushAction<call>(
-        $sendPath.lz::Path::getSrcOApp(),
+        $sendPath.lz::Path::getSrcOApp(), ;; the OApp on this chain
         Layerzero::OP::CHANNEL_SEND_CALLBACK,
         md::MdObj::build(
             md::MessagingReceipt::build(
@@ -685,7 +685,7 @@ tuple lzReceivePrepare(cell $lzReceivePrepareMd) impure inline method_id {
 
     ;; extract oApp from path
     actions~pushAction<dispatch>(
-        $storage.Channel::getPath().lz::Path::getSrcOApp(),
+        $storage.Channel::getPath().lz::Path::getSrcOApp(), ;; the OApp on this chain
         Layerzero::OP::LZ_RECEIVE_PREPARE,
         ;; Throws if the Packet is not executable
         _getExecutablePacket(nonce),
@@ -711,7 +711,7 @@ tuple lzReceiveLock(cell $nonceMd) impure inline method_id {
     (
         cell executionQueue,
         cell $commitPOOO,
-        cell $path
+        cell $sendPath
     ) = $storage.Channel::getLzReceiveLockInformation();
 
     (int actualKey, cell $packet, int status, _) = DeterministicInsertionCircularQueue::get(
@@ -740,14 +740,17 @@ tuple lzReceiveLock(cell $nonceMd) impure inline method_id {
         );
 
         actions~pushAction<call>(
-            $path.lz::Path::getSrcOApp(),
+            $sendPath.lz::Path::getSrcOApp(), ;; the OApp on this chain
             Layerzero::OP::LZ_RECEIVE_EXECUTE,
             md::MdObj::build($packet, getInitialStorage())
         );
     } else {
         actions~pushAction<event>(
             Channel::event::NOT_EXECUTABLE,
-            md::PacketId::New($storage.Channel::getPath(), incomingNonce)
+            md::PacketId::New(
+                $sendPath.lz::Path::reverse(), ;; emit the receive path 
+                incomingNonce
+            )
         );
     }
 
@@ -766,10 +769,16 @@ tuple lzReceiveLock(cell $nonceMd) impure inline method_id {
 tuple lzReceiveExecuteCallback(cell $lzReceiveStatus) impure inline method_id {
     (cell $storage, tuple actions) = preamble();
 
-    (int lzReceiveSuccess, int packetNonce) = $lzReceiveStatus
-        .md::LzReceiveStatus::getSuccessAndNonce();
-    (cell $executePOOO, cell executionQueue, cell $path) = $storage
-        .Channel::getExecutePOOOAndExecutionQueueAndPath();
+    (
+        int lzReceiveSuccess, 
+        int packetNonce
+    ) = $lzReceiveStatus.md::LzReceiveStatus::getSuccessAndNonce();
+
+    (
+        cell $executePOOO, 
+        cell executionQueue, 
+        cell $sendPath
+    ) = $storage.Channel::getExecutePOOOAndExecutionQueueAndPath();
 
     (int actualKey, cell $packet, int status, _) = DeterministicInsertionCircularQueue::get(
         executionQueue,
@@ -792,7 +801,10 @@ tuple lzReceiveExecuteCallback(cell $lzReceiveStatus) impure inline method_id {
         ;; emit Packet in the manager
         actions~pushAction<event>(
             Channel::event::DELIVERED,
-            md::PacketId::build($path, packetNonce)
+            md::PacketId::build(
+                $sendPath.lz::Path::optimizedReverse(), ;; emit the receive path
+                packetNonce
+            )
         );
     } else {
         executionQueue = DeterministicInsertionCircularQueue::set(
@@ -854,14 +866,13 @@ tuple lzReceiveExecuteCallback(cell $lzReceiveStatus) impure inline method_id {
 ;; @permissions only-oApp
 tuple nilify(cell $packetId) impure inline method_id {
     (cell $storage, tuple actions) = preamble();
-
-    cell $sanitizedPacketId = $packetId.md::PacketId::sanitize();
+    $packetId = $packetId.md::PacketId::sanitize();
 
     ;; reverse the path because this is from a receive perspective
-    cell $receivePath = $storage.Channel::getPath().lz::Path::optimizedReverse();
-    _assertEqualPaths($receivePath, $sanitizedPacketId.cl::get<objRef>(md::PacketId::path));
+    cell $receivePath = $storage.Channel::getPath().lz::Path::reverse();
+    _assertEqualPaths($receivePath, $packetId.cl::get<objRef>(md::PacketId::path));
 
-    int incomingNonce = $sanitizedPacketId.cl::get<uint64>(md::PacketId::nonce);
+    int incomingNonce = $packetId.cl::get<uint64>(md::PacketId::nonce);
 
     (int isCommittable, cell $previousPacket) = _nonceCommittable(incomingNonce);
     throw_unless(Channel::ERROR::notCommittable, isCommittable);
@@ -884,9 +895,9 @@ tuple nilify(cell $packetId) impure inline method_id {
     actions~pushAction<event>(Channel::event::PACKET_NILIFIED, $previousPacket);
 
     actions~pushAction<call>(
-        $receivePath.cl::get<address>(lz::Path::dstOApp),
+        $receivePath.cl::get<address>(lz::Path::dstOApp), ;; the OApp on this chain
         Layerzero::OP::NILIFY_CALLBACK,
-        md::MdObj::build($sanitizedPacketId, getInitialStorage())
+        md::MdObj::build($packetId, getInitialStorage())
     );
 
     return actions;
@@ -894,14 +905,13 @@ tuple nilify(cell $packetId) impure inline method_id {
 
 tuple burn(cell $packetId) impure inline method_id {
     (cell $storage, tuple actions) = preamble();
-
-    cell $sanitizedPacketId = $packetId.md::PacketId::sanitize();
+    cell $packetId = $packetId.md::PacketId::sanitize();
 
     ;; reverse the path because this is from a receive perspective
-    cell $receivePath = lz::Path::reverse($storage.Channel::getPath());
-    _assertEqualPaths($receivePath, $sanitizedPacketId.cl::get<objRef>(md::PacketId::path));
+    cell $receivePath = $storage.Channel::getPath().lz::Path::reverse();
+    _assertEqualPaths($receivePath, $packetId.cl::get<objRef>(md::PacketId::path));
 
-    int nonce = $sanitizedPacketId.cl::get<uint64>(md::PacketId::nonce);
+    int nonce = $packetId.cl::get<uint64>(md::PacketId::nonce);
 
     cell $nonceMd = md::Nonce::New(nonce);
 
@@ -927,7 +937,7 @@ tuple burn(cell $packetId) impure inline method_id {
     );
 
     actions~pushAction<call>(
-        $receivePath.cl::get<address>(lz::Path::dstOApp),
+        $receivePath.cl::get<address>(lz::Path::dstOApp), ;; the OApp on this chain
         Layerzero::OP::BURN_CALLBACK,
         md::MdObj::build(
             md::PacketId::New($receivePath, nonce),
@@ -970,11 +980,11 @@ tuple depositZro(cell $coinsAmount) impure inline method_id {
 tuple forceAbort(cell $lzSend) impure inline method_id {
     (cell $storage, tuple actions) = preamble();
 
-    cell $path = $storage.cl::get<objRef>(Channel::path);
+    cell $sendPath = $storage.cl::get<objRef>(Channel::path);
     ;; $lzSend does not need to be sanitized, as it must be correct to match
     ;; the stored hash
     _assertEqualPaths(
-        $path,
+        $sendPath,
         $lzSend.md::LzSend::getPath()
     );
 
@@ -998,7 +1008,7 @@ tuple forceAbort(cell $lzSend) impure inline method_id {
     );
 
     actions~pushAction<call>(
-        $path.cl::get<address>(lz::Path::srcOApp),
+        $sendPath.cl::get<address>(lz::Path::srcOApp), ;; the OApp on this chain
         Layerzero::OP::CHANNEL_SEND_CALLBACK,
         md::MdObj::New(
             md::MessagingReceipt::New($lzSend, 0, 0, Channel::ERROR::sendAborted),

package/src/protocol/msglibs/ultralightnode/msgdata/UlnSendConfig.fc

@@ -59,11 +59,10 @@ cell UlnSendConfig::New(
     );
 }
 
-;; todo update these default values
 cell UlnSendConfig::NewWithDefaults() impure method_id {
     return UlnSendConfig::New(
-        0,
-        0,
+        100 * 1000, ;; Default worker quote gas limit
+        40, ;; Default max message bytes
         true,
         NULLADDRESS,
         true,
@@ -71,7 +70,7 @@ cell UlnSendConfig::NewWithDefaults() impure method_id {
         true,
         empty_cell(),
         true,
-        0
+        1 ;; Default confirmations
     );
 }
 

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

@@ -160,7 +160,7 @@ int _calculateUlnConnectionAddress(cell $storage, cell $path) impure inline meth
 ;;; ==========================HANDLERS=====================================
 
 ;; @in_opcode UlnManager::OP::DEPLOY_ULN
-;; @in_md todo { eid }
+;; @in_md Deploy
 ;; @permissions only-owner
 ;; @out_actions deploy the uln for this particular eid
 tuple deployUln(cell $deploy) impure inline method_id {
@@ -189,7 +189,7 @@ tuple deployUln(cell $deploy) impure inline method_id {
 }
 
 ;; @in_opcode MsglibManager::OP::DEPLOY_CONNECTION
-;; @in_md todo { oApp_path, shard }
+;; @in_md md::Deploy
 ;; @permissions seeded by caller address
 ;; @out_actions deploy the connection for this particular oApp path
 tuple deployUlnConnection(cell $deploy) impure inline method_id {