@layerzerolabs/oft-evm-contracts 1.2.18 → 1.2.20

package/artifacts-zk/contracts/interfaces/IOFT.sol/IOFT.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/be85166c48418856c8b56dff21efc105.json"
+  "buildInfo": "../../../build-info/d2467fad10cf5fa07f3c4c460f383314.json"
 }

package/artifacts-zk/contracts/interfaces/IOFTDecimalUtils.sol/IOFTDecimalUtils.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/be85166c48418856c8b56dff21efc105.json"
+  "buildInfo": "../../../build-info/d2467fad10cf5fa07f3c4c460f383314.json"
 }

package/artifacts-zk/contracts/interfaces/IOFTExtended.sol/IOFTExtended.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/be85166c48418856c8b56dff21efc105.json"
+  "buildInfo": "../../../build-info/d2467fad10cf5fa07f3c4c460f383314.json"
 }

package/artifacts-zk/contracts/interfaces/IOFTExtended.sol/IOFTExtended.json

@@ -41,6 +41,11 @@
       "name": "InvalidBps",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "InvalidCreditRedirectConfig",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InvalidDelegate",
@@ -180,6 +185,56 @@
       "name": "SlippageExceeded",
       "type": "error"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "allowlist",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "escrow",
+              "type": "address"
+            }
+          ],
+          "indexed": false,
+          "internalType": "struct ICreditRedirect.CreditRedirectConfig",
+          "name": "config",
+          "type": "tuple"
+        }
+      ],
+      "name": "CreditRedirectConfigSet",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amountLD",
+          "type": "uint256"
+        }
+      ],
+      "name": "CreditRedirected",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -594,6 +649,34 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint32",
+          "name": "_srcEid",
+          "type": "uint32"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_sender",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "uint64",
+          "name": "_nonce",
+          "type": "uint64"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_payloadHash",
+          "type": "bytes32"
+        }
+      ],
+      "name": "burn",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -607,6 +690,46 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "uint32",
+              "name": "srcEid",
+              "type": "uint32"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "sender",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "uint64",
+              "name": "nonce",
+              "type": "uint64"
+            }
+          ],
+          "internalType": "struct Origin",
+          "name": "_origin",
+          "type": "tuple"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_guid",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "bytes",
+          "name": "_message",
+          "type": "bytes"
+        }
+      ],
+      "name": "clear",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -636,6 +759,31 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "creditRedirectConfig",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "allowlist",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "escrow",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct ICreditRedirect.CreditRedirectConfig",
+          "name": "config",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "defaultFeeBps",
@@ -1021,6 +1169,34 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint32",
+          "name": "_srcEid",
+          "type": "uint32"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_sender",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "uint64",
+          "name": "_nonce",
+          "type": "uint64"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_payloadHash",
+          "type": "bytes32"
+        }
+      ],
+      "name": "nilify",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "oAppVersion",
@@ -1467,6 +1643,31 @@
       "stateMutability": "payable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "allowlist",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "escrow",
+              "type": "address"
+            }
+          ],
+          "internalType": "struct ICreditRedirect.CreditRedirectConfig",
+          "name": "_config",
+          "type": "tuple"
+        }
+      ],
+      "name": "setCreditRedirectConfig",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -1810,6 +2011,29 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint32",
+          "name": "_srcEid",
+          "type": "uint32"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_sender",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "uint64",
+          "name": "_nonce",
+          "type": "uint64"
+        }
+      ],
+      "name": "skip",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "token",

package/artifacts-zk/contracts/libs/OFTComposeMsgCodec.sol/OFTComposeMsgCodec.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/be85166c48418856c8b56dff21efc105.json"
+  "buildInfo": "../../../build-info/d2467fad10cf5fa07f3c4c460f383314.json"
 }

package/artifacts-zk/contracts/libs/OFTComposeMsgCodec.sol/OFTComposeMsgCodec.json

@@ -3,8 +3,8 @@
   "contractName": "OFTComposeMsgCodec",
   "sourceName": "contracts/libs/OFTComposeMsgCodec.sol",
   "abi": [],
-  "bytecode": "0x00000001012001900000000c0000613d0000008001000039000000400010043f0000000001000416000000000101004b0000000c0000c13d00000020010000390000010000100443000001200000044300000005010000410000000f0001042e000000000100001900000010000104300000000e000004320000000f0001042e0000001000010430000000000000000000000000000000000000000000000000000000020000000000000000000000000000004000000100000000000000000035519ae6770075581a330117a93b2d93129c5b3cd486b7ff9e15a2ea6b4ef814",
-  "deployedBytecode": "0x00000001012001900000000c0000613d0000008001000039000000400010043f0000000001000416000000000101004b0000000c0000c13d00000020010000390000010000100443000001200000044300000005010000410000000f0001042e000000000100001900000010000104300000000e000004320000000f0001042e0000001000010430000000000000000000000000000000000000000000000000000000020000000000000000000000000000004000000100000000000000000035519ae6770075581a330117a93b2d93129c5b3cd486b7ff9e15a2ea6b4ef814",
+  "bytecode": "0x0000000100200190000000100000613d0000008001000039000000400010043f0000000001000416000000000001004b000000100000c13d00000140000004430000000001000410000001600010044300000020010000390000010000100443000000010100003900000120001004430000000601000041000000130001042e000000000100001900000014000104300000001200000432000000130001042e000000140001043000000000000000000000000000000000000000000000000000000002000000000000000000000000000000800000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a26469706673582212206abef5b9e3fc784f1809ffaa0bc1e8df81a30f252a494fb299e1f5057e7c480664736f6c6378247a6b736f6c633a312e352e31353b736f6c633a302e382e32363b6c6c766d3a312e302e320055",
+  "deployedBytecode": "0x0000000100200190000000100000613d0000008001000039000000400010043f0000000001000416000000000001004b000000100000c13d00000140000004430000000001000410000001600010044300000020010000390000010000100443000000010100003900000120001004430000000601000041000000130001042e000000000100001900000014000104300000001200000432000000130001042e000000140001043000000000000000000000000000000000000000000000000000000002000000000000000000000000000000800000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a26469706673582212206abef5b9e3fc784f1809ffaa0bc1e8df81a30f252a494fb299e1f5057e7c480664736f6c6378247a6b736f6c633a312e352e31353b736f6c633a302e382e32363b6c6c766d3a312e302e320055",
   "linkReferences": {},
   "deployedLinkReferences": {},
   "factoryDeps": {}

package/artifacts-zk/contracts/libs/OFTMsgCodec.sol/OFTMsgCodec.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/be85166c48418856c8b56dff21efc105.json"
+  "buildInfo": "../../../build-info/d2467fad10cf5fa07f3c4c460f383314.json"
 }

package/artifacts-zk/contracts/libs/OFTMsgCodec.sol/OFTMsgCodec.json

@@ -3,8 +3,8 @@
   "contractName": "OFTMsgCodec",
   "sourceName": "contracts/libs/OFTMsgCodec.sol",
   "abi": [],
-  "bytecode": "0x00000001012001900000000c0000613d0000008001000039000000400010043f0000000001000416000000000101004b0000000c0000c13d00000020010000390000010000100443000001200000044300000005010000410000000f0001042e000000000100001900000010000104300000000e000004320000000f0001042e00000010000104300000000000000000000000000000000000000000000000000000000200000000000000000000000000000040000001000000000000000000a3a5f3688c77c3177737c078ccad07d7eea2ebfbad2585d54ced6965fc9bba11",
-  "deployedBytecode": "0x00000001012001900000000c0000613d0000008001000039000000400010043f0000000001000416000000000101004b0000000c0000c13d00000020010000390000010000100443000001200000044300000005010000410000000f0001042e000000000100001900000010000104300000000e000004320000000f0001042e00000010000104300000000000000000000000000000000000000000000000000000000200000000000000000000000000000040000001000000000000000000a3a5f3688c77c3177737c078ccad07d7eea2ebfbad2585d54ced6965fc9bba11",
+  "bytecode": "0x0000000100200190000000100000613d0000008001000039000000400010043f0000000001000416000000000001004b000000100000c13d00000140000004430000000001000410000001600010044300000020010000390000010000100443000000010100003900000120001004430000000601000041000000130001042e000000000100001900000014000104300000001200000432000000130001042e000000140001043000000000000000000000000000000000000000000000000000000002000000000000000000000000000000800000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a2646970667358221220cacc58adcf4adbae229e366e80d899edc8d602ffb80efd2d47145895d19e42af64736f6c6378247a6b736f6c633a312e352e31353b736f6c633a302e382e32363b6c6c766d3a312e302e320055",
+  "deployedBytecode": "0x0000000100200190000000100000613d0000008001000039000000400010043f0000000001000416000000000001004b000000100000c13d00000140000004430000000001000410000001600010044300000020010000390000010000100443000000010100003900000120001004430000000601000041000000130001042e000000000100001900000014000104300000001200000432000000130001042e000000140001043000000000000000000000000000000000000000000000000000000002000000000000000000000000000000800000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a2646970667358221220cacc58adcf4adbae229e366e80d899edc8d602ffb80efd2d47145895d19e42af64736f6c6378247a6b736f6c633a312e352e31353b736f6c633a302e382e32363b6c6c766d3a312e302e320055",
   "linkReferences": {},
   "deployedLinkReferences": {},
   "factoryDeps": {}

package/artifacts-zk/contracts/utils/OFTDecimalUtils.sol/OFTDecimalUtils.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/be85166c48418856c8b56dff21efc105.json"
+  "buildInfo": "../../../build-info/d2467fad10cf5fa07f3c4c460f383314.json"
 }

package/contracts/interfaces/IOFTExtended.sol

@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import { IOAppExtended } from "@layerzerolabs/oapp-evm-contracts/contracts/interfaces/IOAppExtended.sol";
+import {
+    IOAppExtended,
+    OAPP_EXTENDED_INTERFACE_ID
+} from "@layerzerolabs/oapp-evm-contracts/contracts/interfaces/IOAppExtended.sol";
+import { ICreditRedirect } from "@layerzerolabs/utils-evm-contracts/contracts/interfaces/ICreditRedirect.sol";
 import { IFeeConfig } from "@layerzerolabs/utils-evm-contracts/contracts/interfaces/IFeeConfig.sol";
 import { IFeeHandler } from "@layerzerolabs/utils-evm-contracts/contracts/interfaces/IFeeHandler.sol";
 import { IPauseByID } from "@layerzerolabs/utils-evm-contracts/contracts/interfaces/IPauseByID.sol";
@@ -11,7 +15,16 @@ import { IOFT } from "./IOFT.sol";
 /**
  * @title IOFTExtended
  * @author LayerZero Labs (@TRileySchwarz, tinom.eth)
- * @custom:version 1.0.0
- * @notice Interface for extended OFT contracts with fee, pause, and rate limiter functionality.
+ * @custom:version 1.1.0
+ * @notice Interface for extended OFT contracts with credit redirect, fee, pause, and rate limiter functionality.
  */
-interface IOFTExtended is IOFT, IOAppExtended, IFeeConfig, IFeeHandler, IPauseByID, IRateLimiter {}
+interface IOFTExtended is IOFT, IOAppExtended, ICreditRedirect, IFeeConfig, IFeeHandler, IPauseByID, IRateLimiter {}
+
+/// @dev Flatten all leaf interface IDs.
+bytes4 constant OFT_EXTENDED_INTERFACE_ID = type(IOFT).interfaceId ^
+    OAPP_EXTENDED_INTERFACE_ID ^
+    type(ICreditRedirect).interfaceId ^
+    type(IFeeConfig).interfaceId ^
+    type(IFeeHandler).interfaceId ^
+    type(IPauseByID).interfaceId ^
+    type(IRateLimiter).interfaceId;

package/foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc = '0.8.22'
+solc = '0.8.26'
 verbosity = 3
 src = "contracts"
 test = "test"
@@ -7,7 +7,7 @@ out = "out"
 cache_path = "cache"
 libs = ['node_modules', 'node_modules/@layerzerolabs/toolbox-foundry/lib']
 optimizer = true
-optimizer_runs = 200
+optimizer_runs = 20_000
 
 remappings = [
     'ds-test/=node_modules/@layerzerolabs/toolbox-foundry/lib/ds-test/',

package/hardhat.config.js

@@ -0,0 +1,54 @@
+require('@matterlabs/hardhat-zksync-solc');
+// `hardhat-deploy` is required by `@layerzerolabs/hardhat-tron`.
+require('hardhat-deploy');
+require('@layerzerolabs/hardhat-tron');
+
+module.exports = {
+    paths: {
+        cache: 'hh-cache',
+    },
+    solidity: {
+        compilers: [
+            {
+                version: '0.8.26',
+                settings: {
+                    evmVersion: 'cancun',
+                    optimizer: {
+                        enabled: true,
+                        runs: 20_000,
+                    },
+                },
+            },
+        ],
+    },
+    zksolc: {
+        version: '1.5.15',
+        compilerSource: 'binary',
+        settings: {},
+    },
+    tronSolc: {
+        enable: true,
+        compilers: [
+            {
+                version: '0.8.24',
+                settings: {
+                    optimizer: {
+                        enabled: true,
+                        runs: 20_000,
+                    },
+                },
+            },
+        ],
+    },
+    networks: {
+        'zksync-mainnet': {
+            url: 'https://zksync2-mainnet.zksync.io',
+            ethNetwork: 'https://eth-mainnet.public.blastapi.io',
+            zksync: true,
+        },
+        'tron-mainnet': {
+            url: 'http://127.0.0.1:8514/jsonrpc',
+            tron: true,
+        },
+    },
+};

package/package.json

@@ -1,23 +1,26 @@
 {
   "name": "@layerzerolabs/oft-evm-contracts",
-  "version": "1.2.18",
+  "version": "1.2.20",
   "private": false,
   "description": "LayerZero Labs reference EVM OFT implementation",
   "license": "MIT",
   "devDependencies": {
+    "@layerzerolabs/hardhat-tron": "3.0.168",
     "@layerzerolabs/lz-evm-messagelib-v2": "3.0.168",
     "@layerzerolabs/lz-evm-protocol-v2": "3.0.168",
     "@layerzerolabs/lz-evm-v1-0.7": "3.0.168",
     "@layerzerolabs/test-devtools-evm-foundry": "8.0.1",
     "@layerzerolabs/toolbox-foundry": "^0.1.13",
-    "@openzeppelin/contracts": ">=5.0.2 <5.5.0",
-    "@openzeppelin/contracts-upgradeable": ">=5.0.2 <5.5.0",
+    "@matterlabs/hardhat-zksync-solc": "^1.4.0",
+    "@openzeppelin/contracts": "^5.0.2",
+    "@openzeppelin/contracts-upgradeable": "^5.0.2",
     "ethers": "^5.8.0",
+    "hardhat-deploy": "^0.12.4",
     "solhint": "^6.0.1",
-    "@layerzerolabs/oapp-evm-contracts": "1.2.18",
-    "@layerzerolabs/vm-tooling-evm": "1.2.18",
-    "@layerzerolabs/solhint-configuration": "1.2.18",
-    "@layerzerolabs/utils-evm-contracts": "1.2.18"
+    "@layerzerolabs/oapp-evm-contracts": "1.2.20",
+    "@layerzerolabs/utils-evm-contracts": "1.2.20",
+    "@layerzerolabs/solhint-configuration": "1.2.20",
+    "@layerzerolabs/vm-tooling-evm": "1.2.20"
   },
   "publishConfig": {
     "access": "public",
@@ -33,9 +36,9 @@
   "scripts": {
     "build": "pnpm compile:evm && pnpm compile:zksync && pnpm compile:tron",
     "clean": "rm -rf ./node_modules .turbo ./dist && pnpm generated:clean",
-    "compile:evm": "pnpm lz-tool hardhat compile --config /hardhat/hardhat.default.config.js",
-    "compile:tron": "pnpm lz-tool hardhat compile --config /hardhat/hardhat.default.config.js --network tron-mainnet",
-    "compile:zksync": "pnpm lz-tool hardhat compile --config /hardhat/hardhat.default.config.js --network zksync-mainnet",
+    "compile:evm": "pnpm lz-tool hardhat compile --config ./hardhat.config.js",
+    "compile:tron": "pnpm lz-tool hardhat compile --config ./hardhat.config.js --network tron-mainnet",
+    "compile:zksync": "pnpm lz-tool hardhat compile --config ./hardhat.config.js --network zksync-mainnet",
     "generated:clean": "rm -rf ./artifacts* ./hh-cache* ./out ./cache",
     "lint": "solhint --config solhint.config.js 'contracts/**/*.sol' 'test/**/*.sol' --fix --noPrompt",
     "test": "pnpm lz-tool forge test",