Fix after review

.env.example

@@ -1,2 +1,2 @@
-JSON_RPC_PROVIDER=
-USDC_OWNER_ADDRESS=
+FORK_RPC_PROVIDER=https://eth-mainnet.g.alchemy.com/v2/demo
+USDC_OWNER_ADDRESS=0x7713974908Be4BEd47172370115e8b1219F4A5f0

.gitignore

@@ -17,3 +17,5 @@ node_modules
 ignition/deployments/chain-31337
 
 .openzeppelin
+
+.vscode

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
     "typescript.tsdk": "node_modules/typescript/lib"
-}
+}

contracts/SwapAdapter.sol

@@ -226,7 +226,7 @@ contract SwapAdapter is AccessControl {
 
         IWETH(_weth).withdraw(IERC20(_weth).balanceOf(address(this)));
         vars.ERC20HandlerAddress = _bridge._resourceIDToHandlerAddress(vars.resourceID);
-        IERC20(token).approve(address(vars.ERC20HandlerAddress), amountOut);
+        IERC20(token).forceApprove(address(vars.ERC20HandlerAddress), amountOut);
         _bridge.deposit{value: vars.fee}(destinationDomainID, vars.resourceID, vars.depositData, "");
 
         // Return unspent native currency to msg.sender
@@ -398,7 +398,7 @@ contract SwapAdapter is AccessControl {
         IWETH(_weth).withdraw(IERC20(_weth).balanceOf(address(this)));
 
         vars.ERC20HandlerAddress = _bridge._resourceIDToHandlerAddress(vars.resourceID);
-        IERC20(token).approve(address(vars.ERC20HandlerAddress), amountOut);
+        IERC20(token).forceApprove(address(vars.ERC20HandlerAddress), amountOut);
         _bridge.deposit{value: vars.fee}(destinationDomainID, vars.resourceID, vars.depositData, "");
 
         // Return unspent native currency to msg.sender

contracts/interfaces/IPermit2.sol

@@ -12,4 +12,4 @@ interface IPermit2 {
     /// @dev The packed allowance also holds a nonce, which will stay unchanged in approve
     /// @dev Setting amount to type(uint160).max sets an unlimited approval
     function approve(address token, address spender, uint160 amount, uint48 expiration) external;
-}
+}

contracts/interfaces/IUniversalRouter.sol

@@ -8,4 +8,4 @@ interface IUniversalRouter {
     /// @param inputs An array of byte strings containing abi encoded inputs for each command
     /// @param deadline The deadline by which the transaction must be executed
     function execute(bytes calldata commands, bytes[] calldata inputs, uint256 deadline) external payable;
-}
+}

eslint.config.mjs

@@ -41,4 +41,4 @@ export default [...compat.extends("eslint:recommended"), {
         quotes: ["error", "double"],
         semi: "off",
     },
-}];
+}];

hardhat.config.ts

@@ -6,7 +6,7 @@ import dotenv from "dotenv";
 dotenv.config();
 
 const mainnetFork = {
-  url: `${process.env.JSON_RPC_PROVIDER}`,
+  url: `${process.env.FORK_RPC_PROVIDER}`,
 };
 
 const config: HardhatUserConfig = {