@layerzerolabs/layerzero-v2-ton 3.0.12-ton.0 → 3.0.13-ton.0

package/build/UlnSend.test.fif

@@ -6060,19 +6060,26 @@ PROGRAM{
     TPUSH
   }>
   executeDispatch PROC:<{
-    24 PUSHINT
-    OVER
-    4 INDEX
-    s2 PUSH
-    1 INDEX
     0 PUSHINT
-    s4 PUSH
+    OVER
     2 INDEX
-    s0 s5 XCHG
+    s2 PUSH
     3 INDEX
-    s1 s5 s0 XCHG3
     buildLayerzeroMessageBody INLINECALLDICT
-    s1 s3 s0 XCHG3
+    DUP
+    16 PUSHPOW2DEC
+    CDATASIZE
+    DROP
+    24 PUSHINT
+    s4 PUSH
+    4 INDEX
+    FALSE
+    s0 s3 s4 XCHG3
+    GETFORWARDFEE
+    ADD
+    s0 s3 XCHG
+    1 INDEX
+    s3 s0 s3 XCHG3
     0 PUSHINT
     sendNonTerminalAction INLINECALLDICT
     TRUE

package/build/WorkerCore.test.fif

@@ -2499,19 +2499,26 @@ PROGRAM{
     TPUSH
   }>
   executeDispatch PROC:<{
-    24 PUSHINT
-    OVER
-    4 INDEX
-    s2 PUSH
-    1 INDEX
     0 PUSHINT
-    s4 PUSH
+    OVER
     2 INDEX
-    s0 s5 XCHG
+    s2 PUSH
     3 INDEX
-    s1 s5 s0 XCHG3
     buildLayerzeroMessageBody INLINECALLDICT
-    s1 s3 s0 XCHG3
+    DUP
+    16 PUSHPOW2DEC
+    CDATASIZE
+    DROP
+    24 PUSHINT
+    s4 PUSH
+    4 INDEX
+    FALSE
+    s0 s3 s4 XCHG3
+    GETFORWARDFEE
+    ADD
+    s0 s3 XCHG
+    1 INDEX
+    s3 s0 s3 XCHG3
     0 PUSHINT
     sendNonTerminalAction INLINECALLDICT
     TRUE

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "@layerzerolabs/layerzero-v2-ton",
-  "version": "3.0.12-ton.0",
+  "version": "3.0.13-ton.0",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
     },
+    "./build/*.json": {
+      "default": "./build/*.json",
+      "import": "./build/*.json",
+      "require": "./build/*.json"
+    },
     "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",

package/src/classes/msgdata/ChannelNonceInfo.fc

@@ -4,14 +4,14 @@
 const int md::ChannelNonceInfo::NAME = "cNonceInfo"u;
 
 ;; field names
-const int md::ChannelNonceInfo::firstUncommittedNonce = 0;
+const int md::ChannelNonceInfo::nonce = 0;
 const int md::ChannelNonceInfo::firstUnexecutedNonce = 1;
 
-cell md::ChannelNonceInfo::New(int firstUncommittedNonce, int firstUnexecutedNonce) inline method_id {
+cell md::ChannelNonceInfo::New(int nonce, int firstUnexecutedNonce) inline method_id {
     return cl::declare(
         md::ChannelNonceInfo::NAME,
         unsafeTuple([
-            [cl::t::uint64, firstUncommittedNonce], ;; md::ChannelNonceInfo::firstUncommittedNonce
+            [cl::t::uint64, nonce], ;; md::ChannelNonceInfo::nonce
             [cl::t::uint64, firstUnexecutedNonce]   ;; md::ChannelNonceInfo::firstUnexecutedNonce
         ])
     );

package/src/classes/msgdata/LzReceivePrepare.fc

@@ -0,0 +1,18 @@
+#include "../../funC++/classlib.fc";
+
+;; required storage name
+const int md::LzReceivePrepare::NAME = "lzrecvprep"u;
+
+;; field names
+const int md::LzReceivePrepare::nonce = 0;
+const int md::LzReceivePrepare::nanotons = 1;
+
+cell md::LzReceivePrepare::New(int nonce, int nanotons) method_id {
+    return cl::declare(
+        md::LzReceivePrepare::NAME,
+        unsafeTuple([
+            [cl::t::uint64, nonce], ;; md::LzReceivePrepare::nonce
+            [cl::t::coins, nanotons] ;; md::LzReceivePrepare::nanotons
+        ])
+    );
+}

package/src/funC++/actions/dispatch.fc

@@ -42,15 +42,19 @@ tuple _newAction<dispatch>(int to, int opcode, cell $body, int gasNanos) inline
 }
 
 int executeDispatch(tuple dispatchAction) {
+    cell body = buildLayerzeroMessageBody(
+        0,
+        dispatchAction.int_at(action::call::opcode),
+        dispatchAction.cell_at(action::call::md)
+    );
+
+    (int cellsCount, int bitsCount, _) = body.compute_data_size(MAX_U16);
+
     sendNonTerminalAction(
         SEND_MSG_BOUNCEABLE,
-        dispatchAction.int_at(action::dispatch::gasNanos),
+        dispatchAction.int_at(action::dispatch::gasNanos) + get_forward_fee(cellsCount, bitsCount, false),
         dispatchAction.int_at(action::call::to),
-        buildLayerzeroMessageBody(
-            0,
-            dispatchAction.int_at(action::call::opcode),
-            dispatchAction.cell_at(action::call::md)
-        ),
+        body,
         NORMAL
     );
     return true;