@keep-network/tbtc-v2 1.6.0-dev.0 → 1.6.0-dev.2

package/build/contracts/token/TBTC.sol/TBTC.dbg.json

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

package/build/contracts/vault/DonationVault.sol/DonationVault.dbg.json

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

package/build/contracts/vault/IVault.sol/IVault.dbg.json

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

package/build/contracts/vault/TBTCOptimisticMinting.sol/TBTCOptimisticMinting.dbg.json

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

package/build/contracts/vault/TBTCVault.sol/TBTCVault.dbg.json

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

package/contracts/l2/L2WormholeGateway.sol

@@ -281,14 +281,17 @@ contract L2WormholeGateway is
     ///      - The receiver of the canonical tBTC should be abi-encoded in the
     ///        payload.
     ///      - The receiver of the canonical tBTC must not be the zero address.
+    ///
     ///      The Wormhole Token Bridge contract has protection against redeeming
     ///      the same VAA again. When a Token Bridge VAA is redeemed, its
     ///      message body hash is stored in a map. This map is used to check
     ///      whether the hash has already been set in this map. For this reason,
-    ///      this function does not have to be nonReentrant.
+    ///      this function does not have to be nonReentrant in theory. However,
+    ///      to make this function non-dependent on Wormhole Bridge implementation,
+    ///      we are making it nonReentrant anyway.
     /// @param encodedVm A byte array containing a Wormhole VAA signed by the
     ///        guardians.
-    function receiveTbtc(bytes calldata encodedVm) external {
+    function receiveTbtc(bytes calldata encodedVm) external nonReentrant {
         // ITokenBridge.completeTransferWithPayload completes a contract-controlled
         // transfer of an ERC20 token. Calling this function is not enough to
         // ensure L2WormholeGateway received Wormhole tBTC representation.
@@ -318,40 +321,17 @@ contract L2WormholeGateway is
         if (mintedAmount + amount > mintingLimit) {
             bridgeToken.safeTransfer(receiver, amount);
         } else {
-            // The function is non-reentrant given bridge.completeTransferWithPayload
-            // call that does not allow to use the same VAA again.
+            // The function is non-reentrant.
             // slither-disable-next-line reentrancy-benign
             mintedAmount += amount;
             tbtc.mint(receiver, amount);
         }
 
-        // The function is non-reentrant given bridge.completeTransferWithPayload
-        // call that does not allow to use the same VAA again.
+        // The function is non-reentrant.
         // slither-disable-next-line reentrancy-events
         emit WormholeTbtcReceived(receiver, amount);
     }
 
-    /// @notice Allows to deposit Wormhole tBTC token in exchange for canonical
-    ///         tBTC. Useful in a situation when user received wormhole tBTC
-    ///         instead of canonical tBTC. One example of such situation is
-    ///         when the minting limit was exceeded but the user minted anyway.
-    /// @dev Requirements:
-    ///      - The sender must have at least `amount` of the Wormhole tBTC and
-    ///        it has to be approved for L2WormholeGateway.
-    ///      - The minting limit must allow for minting the given amount.
-    /// @param amount The amount of Wormhole tBTC to deposit.
-    function depositWormholeTbtc(uint256 amount) external {
-        require(
-            mintedAmount + amount <= mintingLimit,
-            "Minting limit exceeded"
-        );
-
-        emit WormholeTbtcDeposited(msg.sender, amount);
-        mintedAmount += amount;
-        bridgeToken.safeTransferFrom(msg.sender, address(this), amount);
-        tbtc.mint(msg.sender, amount);
-    }
-
     /// @notice Lets the governance to update the tBTC gateway address on the
     ///         chain with the given Wormhole ID.
     /// @dev Use toWormholeAddress function to convert between Ethereum and

package/deploy/01_deploy_light_relay.ts

@@ -9,6 +9,9 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     if (hre.network.name === "goerli") {
       return "GoerliLightRelay"
     }
+    if (hre.network.name === "sepolia") {
+      return "SepoliaLightRelay"
+    }
     if (hre.network.name === "system_tests") {
       return "SystemTestRelay"
     }

package/deploy/09_deploy_bridge_governance.ts

@@ -17,8 +17,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     }
   )
 
-  // 60 seconds for Goerli. 48 hours otherwise.
-  const GOVERNANCE_DELAY = hre.network.name === "goerli" ? 60 : 172800
+  // 60 seconds for Goerli/Sepolia. 48 hours otherwise.
+  const GOVERNANCE_DELAY =
+    hre.network.name === "goerli" || hre.network.name === "sepolia"
+      ? 60
+      : 172800
 
   const bridgeGovernance = await deploy("BridgeGovernance", {
     contract: "BridgeGovernance",

package/deploy/19_authorize_spv_maintainer_in_bridge.ts

@@ -21,9 +21,9 @@ func.tags = ["AuthorizeSpvMaintainer"]
 func.dependencies = ["Bridge"]
 
 // SPV maintainer can submit SPV proofs to the Bridge. We authorize spvMaintainer
-// account for Hardhat network (unit tests) and Goerli (testnet) but we DO NOT
-// want to authorize it for Mainnet deployment. SPV maintainer will be authorized
-// separately by the Governance when sweeping will be activated.
+// account for Hardhat network (unit tests) and Goerli/Sepolia (testnets) but we
+// DO NOT want to authorize it for Mainnet deployment. SPV maintainer will be
+// authorized separately by the Governance when sweeping will be activated.
 //
 // Note that at this point MaintainerProxy contract is already authorized in the
 // Bridge (see AuthorizeMaintainerProxyInBridge tag).

package/deploy/24_transfer_tbtc_ownership.ts

@@ -8,7 +8,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // In unit tests we cover VendingMachine, VendingMachineV2, and TBTCVault
   // contracts. All those tests require minting TBTC. To make the test setup
   // easier, we leave the responsibility of transferring the TBTC ownership
-  // to the test. In system tests and on Goerli, TBTCVault is the owner of TBTC
+  // to the test. In system tests and on testnet, TBTCVault is the owner of TBTC
   // token, just like on v1.0 mainnet, after transferring the ownership from the
   // VendingMachine.
   if (hre.network.name !== "hardhat") {

package/deploy/28_authorize_bridge_in_reimbursement_pool.ts

@@ -24,6 +24,6 @@ func.dependencies = ["ReimbursementPool", "Bridge"]
 // On mainnet, the ReimbursementPool ownership is passed to the Threshold
 // Council / DAO and that address is not controlled by the dev team.
 // Hence, this step can be executed only for non-mainnet networks such as
-// Hardhat (unit tests) and Goerli (testnet).
+// Hardhat (unit tests) and Goerli or Sepolia (testnets).
 func.skip = async (hre: HardhatRuntimeEnvironment): Promise<boolean> =>
   hre.network.name === "mainnet"

package/deploy/40_authorize_light_relay_maintainer_proxy_in_reimbursement_pool.ts

@@ -26,6 +26,6 @@ func.dependencies = ["ReimbursementPool", "LightRelayMaintainerProxy"]
 // On mainnet, the ReimbursementPool ownership is passed to the Threshold
 // Council / DAO and that address is not controlled by the dev team.
 // Hence, this step can be executed only for non-mainnet networks such as
-// Hardhat (unit tests) and Goerli (testnet).
+// Hardhat (unit tests) and Goerli or Sepolia (testnets).
 func.skip = async (hre: HardhatRuntimeEnvironment): Promise<boolean> =>
   hre.network.name === "mainnet"

package/deploy/41_authorize_light_relay_maintainer_proxy_in_light_relay.ts

@@ -24,4 +24,6 @@ func.tags = ["AuthorizeLightRelayMaintainerProxyInLightRelay"]
 func.dependencies = ["LightRelay", "LightRelayMaintainerProxy"]
 
 func.skip = async (hre: HardhatRuntimeEnvironment): Promise<boolean> =>
-  hre.network.name === "goerli" || hre.network.name === "system_tests"
+  hre.network.name === "goerli" ||
+  hre.network.name === "sepolia" ||
+  hre.network.name === "system_tests"

package/export/artifacts/@keep-network/bitcoin-spv-sol/contracts/BTCUtils.sol/BTCUtils.json

@@ -109,32 +109,32 @@
         {
           "ast": {
             "nodeType": "YulBlock",
-            "src": "0:201:125",
+            "src": "0:201:126",
             "statements": [
               {
                 "nodeType": "YulBlock",
-                "src": "6:3:125",
+                "src": "6:3:126",
                 "statements": []
               },
               {
                 "body": {
                   "nodeType": "YulBlock",
-                  "src": "123:76:125",
+                  "src": "123:76:126",
                   "statements": [
                     {
                       "nodeType": "YulAssignment",
-                      "src": "133:26:125",
+                      "src": "133:26:126",
                       "value": {
                         "arguments": [
                           {
                             "name": "headStart",
                             "nodeType": "YulIdentifier",
-                            "src": "145:9:125"
+                            "src": "145:9:126"
                           },
                           {
                             "kind": "number",
                             "nodeType": "YulLiteral",
-                            "src": "156:2:125",
+                            "src": "156:2:126",
                             "type": "",
                             "value": "32"
                           }
@@ -142,16 +142,16 @@
                         "functionName": {
                           "name": "add",
                           "nodeType": "YulIdentifier",
-                          "src": "141:3:125"
+                          "src": "141:3:126"
                         },
                         "nodeType": "YulFunctionCall",
-                        "src": "141:18:125"
+                        "src": "141:18:126"
                       },
                       "variableNames": [
                         {
                           "name": "tail",
                           "nodeType": "YulIdentifier",
-                          "src": "133:4:125"
+                          "src": "133:4:126"
                         }
                       ]
                     },
@@ -161,24 +161,24 @@
                           {
                             "name": "headStart",
                             "nodeType": "YulIdentifier",
-                            "src": "175:9:125"
+                            "src": "175:9:126"
                           },
                           {
                             "name": "value0",
                             "nodeType": "YulIdentifier",
-                            "src": "186:6:125"
+                            "src": "186:6:126"
                           }
                         ],
                         "functionName": {
                           "name": "mstore",
                           "nodeType": "YulIdentifier",
-                          "src": "168:6:125"
+                          "src": "168:6:126"
                         },
                         "nodeType": "YulFunctionCall",
-                        "src": "168:25:125"
+                        "src": "168:25:126"
                       },
                       "nodeType": "YulExpressionStatement",
-                      "src": "168:25:125"
+                      "src": "168:25:126"
                     }
                   ]
                 },
@@ -188,13 +188,13 @@
                   {
                     "name": "headStart",
                     "nodeType": "YulTypedName",
-                    "src": "92:9:125",
+                    "src": "92:9:126",
                     "type": ""
                   },
                   {
                     "name": "value0",
                     "nodeType": "YulTypedName",
-                    "src": "103:6:125",
+                    "src": "103:6:126",
                     "type": ""
                   }
                 ],
@@ -202,16 +202,16 @@
                   {
                     "name": "tail",
                     "nodeType": "YulTypedName",
-                    "src": "114:4:125",
+                    "src": "114:4:126",
                     "type": ""
                   }
                 ],
-                "src": "14:185:125"
+                "src": "14:185:126"
               }
             ]
           },
           "contents": "{\n    { }\n    function abi_encode_tuple_t_uint256__to_t_uint256__fromStack_library_reversed(headStart, value0) -> tail\n    {\n        tail := add(headStart, 32)\n        mstore(headStart, value0)\n    }\n}",
-          "id": 125,
+          "id": 126,
           "language": "Yul",
           "name": "#utility.yul"
         }
@@ -219,7 +219,7 @@
       "immutableReferences": {},
       "linkReferences": {},
       "opcodes": "PUSH20 0x0 ADDRESS EQ PUSH1 0x80 PUSH1 0x40 MSTORE PUSH1 0x4 CALLDATASIZE LT PUSH1 0x51 JUMPI PUSH1 0x0 CALLDATALOAD PUSH1 0xE0 SHR DUP1 PUSH4 0x56E04EC EQ PUSH1 0x56 JUMPI DUP1 PUSH4 0x8CC71569 EQ PUSH1 0x71 JUMPI DUP1 PUSH4 0x8DB69E60 EQ PUSH1 0x79 JUMPI DUP1 PUSH4 0xD4258CA7 EQ PUSH1 0x81 JUMPI JUMPDEST PUSH1 0x0 DUP1 REVERT JUMPDEST PUSH1 0x5F PUSH3 0x127500 DUP2 JUMP JUMPDEST PUSH1 0x40 MLOAD SWAP1 DUP2 MSTORE PUSH1 0x20 ADD PUSH1 0x40 MLOAD DUP1 SWAP2 SUB SWAP1 RETURN JUMPDEST PUSH1 0x5F PUSH2 0x7E0 DUP2 JUMP JUMPDEST PUSH1 0x5F PUSH1 0x0 NOT DUP2 JUMP JUMPDEST PUSH1 0x5F PUSH28 0xFFFF0000000000000000000000000000000000000000000000000000 DUP2 JUMP INVALID LOG2 PUSH5 0x6970667358 0x22 SLT KECCAK256 0x21 0xD8 0x5F GT 0xF6 0x4E 0xD4 0x4F 0xFB 0xA5 SWAP12 0xFC PUSH12 0x4A327F00D51E8E91CA784A04 DUP14 CALLDATACOPY 0x29 0xDB ADD 0xB3 PUSH32 0x64736F6C63430008110033000000000000000000000000000000000000000000 ",
-      "sourceMap": "175:38691:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;443:62;;485:20;443:62;;;;;168:25:125;;;156:2;141:18;443:62:0;;;;;;;534:53;;583:4;534:53;;616:104;;-1:-1:-1;;616:104:0;;339:97;;378:58;339:97;"
+      "sourceMap": "175:38691:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;443:62;;485:20;443:62;;;;;168:25:126;;;156:2;141:18;443:62:0;;;;;;;534:53;;583:4;534:53;;616:104;;-1:-1:-1;;616:104:0;;339:97;;378:58;339:97;"
     },
     "gasEstimates": {
       "creation": {