@rev-net/core-v6 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/foundry.toml +1 -1
  2. package/package.json +3 -2
  3. package/script/Deploy.s.sol +9 -8
  4. package/script/helpers/RevnetCoreDeploymentLib.sol +1 -1
  5. package/src/REVDeployer.sol +1 -1
  6. package/src/REVLoans.sol +1 -1
  7. package/test/REV.integrations.t.sol +2 -2
  8. package/test/REVAutoIssuanceFuzz.t.sol +2 -2
  9. package/test/REVDeployerAuditRegressions.t.sol +2 -2
  10. package/test/REVInvincibility.t.sol +2 -2
  11. package/test/REVInvincibilityHandler.sol +1 -1
  12. package/test/REVLifecycle.t.sol +2 -2
  13. package/test/REVLoans.invariants.t.sol +2 -2
  14. package/test/REVLoansAttacks.t.sol +2 -2
  15. package/test/REVLoansAuditRegressions.t.sol +2 -2
  16. package/test/REVLoansFeeRecovery.t.sol +2 -2
  17. package/test/REVLoansSourced.t.sol +2 -2
  18. package/test/REVLoansUnSourced.t.sol +2 -2
  19. package/test/TestPR09_ConversionDocumentation.t.sol +2 -2
  20. package/test/TestPR10_LiquidationBehavior.t.sol +2 -2
  21. package/test/TestPR11_LowFindings.t.sol +2 -2
  22. package/test/TestPR12_FlashLoanSurplus.t.sol +2 -2
  23. package/test/TestPR13_CrossSourceReallocation.t.sol +2 -2
  24. package/test/TestPR15_CashOutCallerValidation.t.sol +2 -2
  25. package/test/TestPR16_ZeroRepayment.t.sol +2 -2
  26. package/test/TestPR21_Uint112Overflow.t.sol +2 -2
  27. package/test/TestPR22_HookArrayOOB.t.sol +2 -2
  28. package/test/TestPR26_BurnHeldTokens.t.sol +2 -2
  29. package/test/TestPR27_CEIPattern.t.sol +2 -2
  30. package/test/TestPR29_SwapTerminalPermission.t.sol +2 -2
  31. package/test/TestPR32_MixedFixes.t.sol +2 -2
  32. package/test/helpers/MaliciousContracts.sol +1 -1
  33. package/test/mock/MockBuybackDataHook.sol +1 -1
package/foundry.toml CHANGED
@@ -1,5 +1,5 @@
1
1
  [profile.default]
2
- solc = '0.8.23'
2
+ solc = '0.8.26'
3
3
  evm_version = 'paris'
4
4
  optimizer_runs = 500
5
5
  libs = ["node_modules", "lib"]
package/package.json CHANGED
@@ -1,12 +1,13 @@
1
1
  {
2
2
  "name": "@rev-net/core-v6",
3
- "version": "0.0.2",
3
+ "version": "0.0.3",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
7
7
  "url": "git+https://github.com/rev-net/revnet-core-v6"
8
8
  },
9
9
  "scripts": {
10
+ "postinstall": "find node_modules -name '*.sol' -type f | xargs grep -l 'pragma solidity 0.8.23;' 2>/dev/null | xargs sed -i '' 's/pragma solidity 0.8.23;/pragma solidity 0.8.26;/g' 2>/dev/null || true",
10
11
  "test": "forge test",
11
12
  "coverage:integration": "forge coverage --match-path \"./src/*.sol\" --report lcov --report summary",
12
13
  "deploy:mainnets": "source ./.env && export START_TIME=$(date +%s) && npx sphinx propose ./script/Deploy.s.sol --networks mainnets",
@@ -21,7 +22,7 @@
21
22
  "@bananapus/core-v6": "^0.0.4",
22
23
  "@bananapus/permission-ids-v6": "^0.0.2",
23
24
  "@bananapus/suckers-v6": "^0.0.1",
24
- "@bananapus/swap-terminal-v6": "^0.0.2",
25
+ "@bananapus/router-terminal-v6": "^0.0.2",
25
26
  "@croptop/core-v6": "^0.0.3",
26
27
  "@openzeppelin/contracts": "^5.2.0"
27
28
  },
@@ -1,11 +1,11 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
5
5
  import "@bananapus/buyback-hook-v6/script/helpers/BuybackDeploymentLib.sol";
6
6
  import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
7
7
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
8
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
8
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
9
9
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
10
10
 
11
11
  import {Sphinx} from "@sphinx-labs/contracts/SphinxPlugin.sol";
@@ -48,8 +48,8 @@ contract DeployScript is Script, Sphinx {
48
48
  Hook721Deployment hook;
49
49
  /// @notice tracks the deployment of the sucker contracts for the chain we are deploying to.
50
50
  SuckerDeployment suckers;
51
- /// @notice tracks the deployment of the swap terminal.
52
- SwapTerminalDeployment swapTerminal;
51
+ /// @notice tracks the deployment of the router terminal.
52
+ RouterTerminalDeployment routerTerminal;
53
53
 
54
54
  uint32 PREMINT_CHAIN_ID = 1;
55
55
  string NAME = "Revnet";
@@ -103,10 +103,11 @@ contract DeployScript is Script, Sphinx {
103
103
  hook = Hook721DeploymentLib.getDeployment(
104
104
  vm.envOr("NANA_721_DEPLOYMENT_PATH", string("node_modules/@bananapus/721-hook-v6/deployments/"))
105
105
  );
106
- // Get the deployment addresses for the 721 hook contracts for this chain.
107
- swapTerminal = SwapTerminalDeploymentLib.getDeployment(
106
+ // Get the deployment addresses for the router terminal contracts for this chain.
107
+ routerTerminal = RouterTerminalDeploymentLib.getDeployment(
108
108
  vm.envOr(
109
- "NANA_SWAP_TERMINAL_DEPLOYMENT_PATH", string("node_modules/@bananapus/swap-terminal-v6/deployments/")
109
+ "NANA_ROUTER_TERMINAL_DEPLOYMENT_PATH",
110
+ string("node_modules/@bananapus/router-terminal-v6/deployments/")
110
111
  )
111
112
  );
112
113
  // Get the deployment addresses for the 721 hook contracts for this chain.
@@ -137,7 +138,7 @@ contract DeployScript is Script, Sphinx {
137
138
  terminalConfigurations[0] =
138
139
  JBTerminalConfig({terminal: core.terminal, accountingContextsToAccept: accountingContextsToAccept});
139
140
  terminalConfigurations[1] = JBTerminalConfig({
140
- terminal: IJBTerminal(address(swapTerminal.native_registry)),
141
+ terminal: IJBTerminal(address(routerTerminal.registry)),
141
142
  accountingContextsToAccept: new JBAccountingContext[](0)
142
143
  });
143
144
 
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import {stdJson} from "forge-std/Script.sol";
5
5
  import {Vm} from "forge-std/Vm.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
5
5
  import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
package/src/REVLoans.sol CHANGED
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
5
5
  import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import {StdInvariant} from "forge-std/StdInvariant.sol";
@@ -14,7 +14,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
14
14
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
15
15
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
16
16
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
17
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
17
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
18
18
 
19
19
  import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.sol";
20
20
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import {StdInvariant} from "forge-std/StdInvariant.sol";
@@ -14,7 +14,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
14
14
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
15
15
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
16
16
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
17
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
17
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
18
18
 
19
19
  import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.sol";
20
20
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBFees} from "@bananapus/core-v6/src/libraries/JBFees.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
 
17
17
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
18
18
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
17
17
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
18
18
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {JBSingleAllowance} from "@bananapus/core-v6/src/structs/JBSingleAllowance.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
17
17
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
18
18
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
17
17
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
18
18
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {JBSingleAllowance} from "@bananapus/core-v6/src/structs/JBSingleAllowance.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
17
17
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
18
18
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {REVLoans} from "../src/REVLoans.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
17
17
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
18
18
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -12,7 +12,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
12
12
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
13
13
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
14
14
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
15
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
15
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
16
16
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
17
17
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
18
18
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {JBPermissionIds} from "@bananapus/permission-ids-v6/src/JBPermissionIds.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import "forge-std/Test.sol";
5
5
  import /* {*} from */ "@bananapus/core-v6/test/helpers/TestBaseWorkflow.sol";
@@ -11,7 +11,7 @@ import "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
11
11
  import "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
12
12
  import "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
13
13
  import "@croptop/core-v6/script/helpers/CroptopDeploymentLib.sol";
14
- import "@bananapus/swap-terminal-v6/script/helpers/SwapTerminalDeploymentLib.sol";
14
+ import "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
15
15
  import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
16
16
  import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
17
17
  import {MockPriceFeed} from "@bananapus/core-v6/test/mock/MockPriceFeed.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
5
5
  import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: MIT
2
- pragma solidity 0.8.23;
2
+ pragma solidity 0.8.26;
3
3
 
4
4
  import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDataHook.sol";
5
5
  import {IJBPayHook} from "@bananapus/core-v6/src/interfaces/IJBPayHook.sol";