diff --git a/foundry.toml b/foundry.toml index 332ea8c..9622b62 100644 --- a/foundry.toml +++ b/foundry.toml @@ -111,6 +111,23 @@ via_ir = true # Backwards-compatible alias for older scripts; prefer profile.chain138. evm_version = "paris" +# Historical WETH10 verification source. The live Chain 138 WETH10 runtime +# matches upstream WETH10 v10 compiled with solc 0.7.6 and optimizer runs 20000, +# modulo Solidity immutable slots from a mainnet-chain-id deployment. +[profile.weth10_verify] +src = "lib/weth10/contracts" +out = "out/scopes/weth10" +cache_path = "cache/scopes/weth10" +libs = ["lib", "lib/weth10/node_modules"] +solc = "0.7.6" +optimizer = true +optimizer_runs = 20000 +via_ir = false +auto_detect_remappings = false +remappings = [ + "erc3156/=lib/weth10/node_modules/erc3156/" +] + # BSC CompliantWrappedToken — matches verified cWUSDT on BscScan (chain 56). # Use with scoped build: FOUNDRY_SRC=contracts/tokens FOUNDRY_OUT=out/scopes/tokens # bash scripts/forge/scope.sh build tokens diff --git a/script/DeployGovernanceToken.s.sol b/script/DeployGovernanceToken.s.sol index 7295393..2fd791f 100644 --- a/script/DeployGovernanceToken.s.sol +++ b/script/DeployGovernanceToken.s.sol @@ -5,7 +5,7 @@ import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/access/Ownable.sol"; -import "@openzeppelin/contracts/security/Pausable.sol"; +import "@openzeppelin/contracts/utils/Pausable.sol"; /** * @title Governance Token diff --git a/script/DeployUSDC.s.sol b/script/DeployUSDC.s.sol index 6efa4c8..778450c 100644 --- a/script/DeployUSDC.s.sol +++ b/script/DeployUSDC.s.sol @@ -5,7 +5,7 @@ import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/access/Ownable.sol"; -import "@openzeppelin/contracts/security/Pausable.sol"; +import "@openzeppelin/contracts/utils/Pausable.sol"; /** * @title Standard USDC Token diff --git a/script/DeployUSDT.s.sol b/script/DeployUSDT.s.sol index 08afbcc..6b79f31 100644 --- a/script/DeployUSDT.s.sol +++ b/script/DeployUSDT.s.sol @@ -5,7 +5,7 @@ import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/access/Ownable.sol"; -import "@openzeppelin/contracts/security/Pausable.sol"; +import "@openzeppelin/contracts/utils/Pausable.sol"; /** * @title Standard USDT Token diff --git a/scripts/reserve/pmm-mesh-6s-automation.sh b/scripts/reserve/pmm-mesh-6s-automation.sh index 07627ad..05cd9b3 100755 --- a/scripts/reserve/pmm-mesh-6s-automation.sh +++ b/scripts/reserve/pmm-mesh-6s-automation.sh @@ -26,6 +26,10 @@ # set -euo pipefail +# .env may reference ${INFURA_PROJECT_ID} before load-project-env runs +export INFURA_PROJECT_ID="${INFURA_PROJECT_ID:-}" +export INFURA_PROJECT_SECRET="${INFURA_PROJECT_SECRET:-}" + SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SMOM_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" cd "$SMOM_ROOT"