From c609a06a894debec79a175237f3349d45d61964a Mon Sep 17 00:00:00 2001 From: Conner Swenberg Date: Thu, 18 Dec 2025 23:04:11 -0800 Subject: [PATCH 1/2] Update scripts --- {scripts => script}/EncodePayout.s.sol | 0 {scripts => script}/LookupAllowedCharacters.s.sol | 0 {scripts => script}/deploy/DeployAdConversion.s.sol | 0 {scripts => script}/deploy/DeployAll.s.sol | 0 {scripts => script}/deploy/DeployBridgeReferralFees.s.sol | 6 +++--- {scripts => script}/deploy/DeployCashbackRewards.s.sol | 0 {scripts => script}/deploy/DeployFlywheel.s.sol | 0 {scripts => script}/deploy/DeploySimpleRewards.s.sol | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename {scripts => script}/EncodePayout.s.sol (100%) rename {scripts => script}/LookupAllowedCharacters.s.sol (100%) rename {scripts => script}/deploy/DeployAdConversion.s.sol (100%) rename {scripts => script}/deploy/DeployAll.s.sol (100%) rename {scripts => script}/deploy/DeployBridgeReferralFees.s.sol (90%) rename {scripts => script}/deploy/DeployCashbackRewards.s.sol (100%) rename {scripts => script}/deploy/DeployFlywheel.s.sol (100%) rename {scripts => script}/deploy/DeploySimpleRewards.s.sol (100%) diff --git a/scripts/EncodePayout.s.sol b/script/EncodePayout.s.sol similarity index 100% rename from scripts/EncodePayout.s.sol rename to script/EncodePayout.s.sol diff --git a/scripts/LookupAllowedCharacters.s.sol b/script/LookupAllowedCharacters.s.sol similarity index 100% rename from scripts/LookupAllowedCharacters.s.sol rename to script/LookupAllowedCharacters.s.sol diff --git a/scripts/deploy/DeployAdConversion.s.sol b/script/deploy/DeployAdConversion.s.sol similarity index 100% rename from scripts/deploy/DeployAdConversion.s.sol rename to script/deploy/DeployAdConversion.s.sol diff --git a/scripts/deploy/DeployAll.s.sol b/script/deploy/DeployAll.s.sol similarity index 100% rename from scripts/deploy/DeployAll.s.sol rename to script/deploy/DeployAll.s.sol diff --git a/scripts/deploy/DeployBridgeReferralFees.s.sol b/script/deploy/DeployBridgeReferralFees.s.sol similarity index 90% rename from scripts/deploy/DeployBridgeReferralFees.s.sol rename to script/deploy/DeployBridgeReferralFees.s.sol index 041b60ab..176a9054 100644 --- a/scripts/deploy/DeployBridgeReferralFees.s.sol +++ b/script/deploy/DeployBridgeReferralFees.s.sol @@ -12,15 +12,15 @@ contract DeployBridgeReferralFees is Script { function run() external returns (address) { address flywheel = 0x00000F14AD09382841DB481403D1775ADeE1179F; address builderCodes = 0xf20b8A32C39f3C56bBD27fe8438090B5a03b6381; - return run(flywheel, builderCodes); + return _run(flywheel, builderCodes); } - function run(address flywheel, address builderCodes) public returns (address) { + function _run(address flywheel, address builderCodes) public returns (address) { require(flywheel != address(0), "Flywheel cannot be zero address"); require(builderCodes != address(0), "Flywheel cannot be zero address"); string memory metadataURI = ""; - uint16 maxFeeBasisPoints = 200; + uint8 maxFeeBasisPoints = 100; vm.startBroadcast(); diff --git a/scripts/deploy/DeployCashbackRewards.s.sol b/script/deploy/DeployCashbackRewards.s.sol similarity index 100% rename from scripts/deploy/DeployCashbackRewards.s.sol rename to script/deploy/DeployCashbackRewards.s.sol diff --git a/scripts/deploy/DeployFlywheel.s.sol b/script/deploy/DeployFlywheel.s.sol similarity index 100% rename from scripts/deploy/DeployFlywheel.s.sol rename to script/deploy/DeployFlywheel.s.sol diff --git a/scripts/deploy/DeploySimpleRewards.s.sol b/script/deploy/DeploySimpleRewards.s.sol similarity index 100% rename from scripts/deploy/DeploySimpleRewards.s.sol rename to script/deploy/DeploySimpleRewards.s.sol From 8b573efbbe92ab2e15f5580c1b70c20dadd8c8c6 Mon Sep 17 00:00:00 2001 From: Conner Swenberg Date: Thu, 18 Dec 2025 23:10:29 -0800 Subject: [PATCH 2/2] Update scripts --- script/LookupAllowedCharacters.s.sol | 15 --------------- script/deploy/DeployAll.s.sol | 14 +++++++------- script/deploy/DeployBridgeReferralFees.s.sol | 8 +------- 3 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 script/LookupAllowedCharacters.s.sol diff --git a/script/LookupAllowedCharacters.s.sol b/script/LookupAllowedCharacters.s.sol deleted file mode 100644 index 44370f48..00000000 --- a/script/LookupAllowedCharacters.s.sol +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: Unlicense -pragma solidity 0.8.29; - -import {Script} from "forge-std/Script.sol"; -import {console} from "forge-std/console.sol"; -import {LibString} from "solady/utils/LibString.sol"; - -import {BuilderCodes} from "../src/BuilderCodes.sol"; - -contract LookupAllowedCharacters is Script { - function run() external { - BuilderCodes codes = new BuilderCodes(); - console.log("Allowed characters:", LibString.to7BitASCIIAllowedLookup(codes.ALLOWED_CHARACTERS())); - } -} diff --git a/script/deploy/DeployAll.s.sol b/script/deploy/DeployAll.s.sol index 236a63f6..52f22399 100644 --- a/script/deploy/DeployAll.s.sol +++ b/script/deploy/DeployAll.s.sol @@ -5,7 +5,7 @@ import {Script} from "forge-std/Script.sol"; import {console} from "forge-std/console.sol"; import {DeployAdConversion} from "./DeployAdConversion.s.sol"; -import {DeployBridgeRewards} from "./DeployBridgeRewards.s.sol"; +import {DeployBridgeReferralFees} from "./DeployBridgeReferralFees.s.sol"; import {DeployCashbackRewards} from "./DeployCashbackRewards.s.sol"; import {DeployFlywheel} from "./DeployFlywheel.s.sol"; import {DeploySimpleRewards} from "./DeploySimpleRewards.s.sol"; @@ -17,7 +17,7 @@ contract DeployAll is Script { address flywheel; address adConversion; address cashbackRewards; - address bridgeRewards; + address bridgeReferralFees; address simpleRewards; } @@ -49,10 +49,10 @@ contract DeployAll is Script { DeploySimpleRewards simpleRewardsDeployer = new DeploySimpleRewards(); deployments.simpleRewards = simpleRewardsDeployer.run(deployments.flywheel); - // Deploy BridgeRewards (depends on Flywheel, BuilderCodes) - // console.log("5. Deploying BridgeRewards..."); - // DeployBridgeRewards bridgeRewardsDeployer = new DeployBridgeRewards(); - // deployments.bridgeRewards = bridgeRewardsDeployer.run(deployments.flywheel, builderCodes); + // Deploy BridgeReferralFees (depends on Flywheel, BuilderCodes) + console.log("5. Deploying BridgeReferralFees..."); + DeployBridgeReferralFees bridgeReferralFeesDeployer = new DeployBridgeReferralFees(); + deployments.bridgeReferralFees = bridgeReferralFeesDeployer.run(deployments.flywheel, builderCodes); console.log("=========================================="); console.log("Deployment complete!"); @@ -60,7 +60,7 @@ contract DeployAll is Script { console.log("AdConversion:", deployments.adConversion); console.log("CashbackRewards:", deployments.cashbackRewards); console.log("SimpleRewards:", deployments.simpleRewards); - // console.log("BridgeRewards:", deployments.bridgeRewards); + console.log("BridgeReferralFees:", deployments.bridgeReferralFees); return deployments; } diff --git a/script/deploy/DeployBridgeReferralFees.s.sol b/script/deploy/DeployBridgeReferralFees.s.sol index 176a9054..b02ddcb8 100644 --- a/script/deploy/DeployBridgeReferralFees.s.sol +++ b/script/deploy/DeployBridgeReferralFees.s.sol @@ -9,13 +9,7 @@ import {BridgeReferralFees} from "../../src/hooks/BridgeReferralFees.sol"; /// @notice Script for deploying the BridgeReferralFees hook contract contract DeployBridgeReferralFees is Script { - function run() external returns (address) { - address flywheel = 0x00000F14AD09382841DB481403D1775ADeE1179F; - address builderCodes = 0xf20b8A32C39f3C56bBD27fe8438090B5a03b6381; - return _run(flywheel, builderCodes); - } - - function _run(address flywheel, address builderCodes) public returns (address) { + function run(address flywheel, address builderCodes) public returns (address) { require(flywheel != address(0), "Flywheel cannot be zero address"); require(builderCodes != address(0), "Flywheel cannot be zero address");