Skip to content

Feat/factor tracking #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
killroy192 merged 4 commits into from
Apr 23, 2026
Merged

Feat/factor tracking #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cb05b0
CommitmentRemoved with factor
killroy192 Apr 23, 2026
9f79210
fix: protection from permit griefing
killroy192 Apr 23, 2026
9c457fe
deploy to base
killroy192 Apr 23, 2026
6684943
add test
killroy192 Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions abi/IVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
"internalType": "uint256",
"name": "poseidonHash",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "factor",
"type": "uint256"
}
],
"name": "CommitmentRemoved",
Expand Down
6 changes: 6 additions & 0 deletions abi/IVaultEvents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
"internalType": "uint256",
"name": "poseidonHash",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "factor",
"type": "uint256"
}
],
"name": "CommitmentRemoved",
Expand Down
6 changes: 6 additions & 0 deletions abi/Vault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@
"internalType": "uint256",
"name": "poseidonHash",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "factor",
"type": "uint256"
}
],
"name": "CommitmentRemoved",
Expand Down
6 changes: 6 additions & 0 deletions abi/VaultSpendLib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@
"internalType": "uint256",
"name": "poseidonHash",
"type": "uint256"
},
{
"indexed": false,
"internalType": "uint256",
"name": "factor",
"type": "uint256"
}
],
"name": "CommitmentRemoved",
Expand Down
30 changes: 16 additions & 14 deletions ignition/deployments/chain-8453/deployed_addresses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,22 @@
"Main#Spend61Verifier": "0xb326b4c7d6CcE4e52a4F26eF3B9887970a3bF189",
"Main#Spend121Verifier": "0xfb36dc2d86652d90960da47b7485E246EC895369",
"Main#Verifiers": "0xfaf0cc3f0A38021f9d873130ACc62F7824Fc339D",
"Main#Administrator_0": "0x86f5A233a477fd2Fd338F294Ae7277407b60655a",
"Main#Forwarder_0": "0xf3430970980d60BEEcEcC5f72b3868B891127c83",
"Main#InvoiceFactory_0": "0xaAc5Dfc0Cb60b5F829e67749a72101A9d7C67FaD",
"Main#TokenDistributorDeployLib_0": "0xe279F01DF9a69695D3203009be176dbB36106241",
"Main#InterestLib_0": "0xe8426F0675C9Da7340b4E8801cDE6a5C59f23Eb7",
"Main#VaultMathLib_0": "0x67bCC483fAaD61c3B7eBAdb31c884b8Aba9A13Ff",
"Main#InputsLib_0": "0x8B77b2Bf6A592361aF18803d785c25a1BBE1104c",
"Main#InvestmentVaultLib_0": "0x3B0775204AF03c2E9940CfbCB9fbeA0949CadA7B",
"Main#InputModifierLib_0": "0x47F8FB8136BFAFb9791D4C0CBf8e0764b02D619e",
"Main#VaultInitLib_0": "0x262166E3d46dA3a796BF7BE448bdddfd11FFB56f",
"Main#VaultDepositLib_0": "0x60d879820974964b793B60a9FA14103B7f9527B0",
"Main#VaultSpendLib_0": "0x421DA02Cb0C0f457F96abF719A48ef61E78c3376",
"Main#Vault_0": "0xA92aA9b65d2D5b6C9a5Af2C4365357A304FC247B",
"Main#Administrator": "0x86f5A233a477fd2Fd338F294Ae7277407b60655a",
"Main#Forwarder": "0xf3430970980d60BEEcEcC5f72b3868B891127c83",
"Main#InvoiceFactory": "0xaAc5Dfc0Cb60b5F829e67749a72101A9d7C67FaD",
"Main#TokenDistributorDeployLib": "0xe279F01DF9a69695D3203009be176dbB36106241",
"Main#InterestLib": "0xe8426F0675C9Da7340b4E8801cDE6a5C59f23Eb7",
"Main#VaultMathLib": "0x67bCC483fAaD61c3B7eBAdb31c884b8Aba9A13Ff",
"Main#InputsLib": "0x8B77b2Bf6A592361aF18803d785c25a1BBE1104c",
"Main#InvestmentVaultLib": "0x3B0775204AF03c2E9940CfbCB9fbeA0949CadA7B",
"Main#InputModifierLib": "0x47F8FB8136BFAFb9791D4C0CBf8e0764b02D619e",
"Main#VaultInitLib": "0x262166E3d46dA3a796BF7BE448bdddfd11FFB56f",
"Main#VaultDepositLib": "0x60d879820974964b793B60a9FA14103B7f9527B0",
"Main#VaultSpendLib": "0x421DA02Cb0C0f457F96abF719A48ef61E78c3376",
"Main#VaultImplementation": "0xA92aA9b65d2D5b6C9a5Af2C4365357A304FC247B",
"Main#VaultProxy": "0xE0Eefe4AA0cB32740aDFD8083AbeC255AaC3b379",
"Main#Vault": "0xE0Eefe4AA0cB32740aDFD8083AbeC255AaC3b379",
"Main#ProtocolManager": "0xCC499487F6a1780dB9410a65408B98E63346aCfe"
"Main#ProtocolManager": "0xCC499487F6a1780dB9410a65408B98E63346aCfe",
"VaultUpgradeProd#VaultSpendLib": "0x94CE27CDFD55208678FB250FeD21B7f1FfdEc4Ff",
"VaultUpgradeProd#VaultImplementation": "0x5Bb28C730A85D2C5Ea834592b6D06a444D607AB7"
}
46 changes: 14 additions & 32 deletions ignition/modules/VaultUpgrade.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,19 @@
import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";

export default buildModule("VaultUpgrade", (m) => {
const interestLib = m.library("InterestLib", {
id: `InterestLib_${process.env.VERSION_TAG ?? 0}`,
});
const vaultMathLib = m.library("VaultMathLib", {
id: `VaultMathLib_${process.env.VERSION_TAG ?? 0}`,
after: [interestLib],
});
export default buildModule("VaultUpgradeProd", (m) => {
const interestLib = m.contractAt("InterestLib", "0xe8426F0675C9Da7340b4E8801cDE6a5C59f23Eb7");
const vaultMathLib = m.contractAt("VaultMathLib", "0x67bCC483fAaD61c3B7eBAdb31c884b8Aba9A13Ff");

const inputsLib = m.library("InputsLib", {
id: `InputsLib_${process.env.VERSION_TAG ?? 0}`,
after: [vaultMathLib],
});
const inputsLib = m.contractAt("InputsLib", "0x8B77b2Bf6A592361aF18803d785c25a1BBE1104c");

const investmentVaultLib = m.library("InvestmentVaultLib", {
id: `InvestmentVaultLib_${process.env.VERSION_TAG ?? 0}`,
after: [inputsLib],
});
const investmentVaultLib = m.contractAt("InvestmentVaultLib", "0x3B0775204AF03c2E9940CfbCB9fbeA0949CadA7B");

const inputModifierLib = m.library("InputModifierLib", {
id: `InputModifierLib_${process.env.VERSION_TAG ?? 0}`,
libraries: { VaultMathLib: vaultMathLib, InterestLib: interestLib, InvestmentVaultLib: investmentVaultLib },
});
const inputModifierLib = m.contractAt("InputModifierLib", "0x47F8FB8136BFAFb9791D4C0CBf8e0764b02D619e");

const vaultDepositLib = m.library("VaultDepositLib", {
id: `VaultDepositLib_${process.env.VERSION_TAG ?? 0}`,
libraries: {
VaultMathLib: vaultMathLib,
InterestLib: interestLib,
InvestmentVaultLib: investmentVaultLib,
InputsLib: inputsLib,
},
});
const vaultDepositLib = m.contractAt("VaultDepositLib", "0x60d879820974964b793B60a9FA14103B7f9527B0");

const vaultSpendLib = m.library("VaultSpendLib", {
id: `VaultSpendLib_${process.env.VERSION_TAG ?? 0}`,
id: `VaultSpendLib_1`,
libraries: {
VaultMathLib: vaultMathLib,
InterestLib: interestLib,
Expand All @@ -44,15 +22,19 @@ export default buildModule("VaultUpgrade", (m) => {
},
after: [vaultDepositLib],
});
const newImplementation = m.contract("VaultV2", [], {

const vaultInitLib = m.contractAt("VaultInitLib", "0x262166E3d46dA3a796BF7BE448bdddfd11FFB56f");

const newImplementation = m.contract("Vault", [], {
libraries: {
InvestmentVaultLib: investmentVaultLib,
InputModifierLib: inputModifierLib,
VaultInitLib: vaultInitLib,
VaultDepositLib: vaultDepositLib,
VaultSpendLib: vaultSpendLib,
InterestLib: interestLib,
},
id: `Vault_${process.env.VERSION_TAG ?? 0}`,
id: `Vault_1`,
after: [vaultSpendLib],
});

Expand Down
34 changes: 20 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 2 additions & 22 deletions scripts/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { NetworkConfig } from "hardhat/types";
import { mkCreateXSalt } from "./mkCreateXSalt";
import MocksModule from "../ignition/modules/Mocks.module";
import { deploymentChange } from "./deploymentChange";
import { getIgnitionConfig } from "./getIgnitionConfig";

type Params = {
admin: string;
Expand All @@ -28,28 +29,7 @@ async function main() {
console.log(`Deployer: ${deployer.address}`);
const isHardhat = hre.network.name === "hardhat";

let ignitionConfig;

switch (hre.network.name) {
case "hardhat":
ignitionConfig = {
blockPollingInterval: 1500,
requiredConfirmations: 2,
};
break;
case "localhost":
ignitionConfig = {
blockPollingInterval: 1500,
requiredConfirmations: 2,
};
break;
default:
ignitionConfig = {
blockPollingInterval: 1900,
requiredConfirmations: 15,
};
break;
}
const ignitionConfig = await getIgnitionConfig(hre.network.name);

const rawParams = (
hre.network.config as NetworkConfig & {
Expand Down
Loading
Loading