40 Commits

Author SHA1 Message Date
hueso
6d6f9291ab OZ v5.5.0 2026-06-01 21:51:18 +00:00
hueso
a87a65df86 bump OZ version to 5.5.0-rc.1 2026-06-01 21:51:18 +00:00
hueso
dfe5e20c62 restore trustedForwarders as an OZ override 2026-06-01 21:51:18 +00:00
hueso
66ad51e814 import ECDSA, ERC2771, ERC20, MerkleProofLib from @openzeppelin 2026-06-01 21:51:18 +00:00
hueso
27358d1e38 WIP: use openzeppelin contracts 2026-06-01 21:51:18 +00:00
hueso
439b176989 updated RPC urls 2026-06-01 21:51:18 +00:00
hueso
929c4ccc4e rootstock testnet re-deployment 2026-06-01 21:51:18 +00:00
hueso
4eec389fc0 bump solidity verison 2026-06-01 21:51:18 +00:00
hueso
f93e4db532 Ethers v5 -> v6 migration
Updated dependencies and removed unused ones.
2026-06-01 21:51:18 +00:00
hueso
4db911cc52 Partial hardhat -> viem migration for tests.
Typescript updated to v5.
Notably all calls to p2pix.callStatic.getStr() were replaced by viem.stringToHex() due to bug in ethers (https://github.com/ethers-io/ethers.js/issues/4965)
Full migration to viem might not be possible currently due to hard-chai-matchers incompatibility:
> The hardhat-chai-matchers plugin is designed to work with hardhat-ethers. Attempting to use it in conjunction with hardhat-viem results in compatibility issues.
https://hardhat.org/hardhat-chai-matchers/docs/overview
2026-06-01 21:51:18 +00:00
hueso
9524b755f2 sepolia deployment 2026-06-01 21:51:18 +00:00
hueso
abd55bbf77 ditch amount hardcodings 2026-06-01 21:51:18 +00:00
hueso
0144843167 set deposit() nonReentrant 2026-06-01 21:51:18 +00:00
hueso
a49b71f736 update tests for current function parameters 2026-06-01 21:51:18 +00:00
hueso
82cbac29f6 update documentation 2026-06-01 21:51:18 +00:00
hueso
982cf6ca9b restore function parameters. reverts 26a4952 2026-06-01 21:51:18 +00:00
hueso
45e7cc331f add RSK networks 2026-06-01 21:51:18 +00:00
hueso
453adf4e0c ERC2771 compatibility 2026-06-01 21:51:18 +00:00
hueso
6ef27ef916 add artifacts to .gitignore 2026-06-01 21:51:18 +00:00
hueso
62d2afbbd0 mark assembly blocks as memory-safe 2026-06-01 21:51:18 +00:00
hueso
4b35847d79 use ERC20 datatype 2026-06-01 21:51:18 +00:00
hueso
0107816dc5 revamped lock() conditionals 2026-06-01 21:51:18 +00:00
PedroCailleret
32bd86e7cb increased lock gas savings 2026-06-01 21:51:18 +00:00
PedroCailleret
7fe6415eed Added support for flatsigs 2026-06-01 21:51:18 +00:00
PedroCailleret
3f9dff5b56 Moved stack allocation from memory to calldata 2026-06-01 21:51:18 +00:00
PedroCailleret
6e7a5813b9 🔧 Inheritance reordering 2026-06-01 21:51:18 +00:00
PedroCailleret
2a3ad59e7a Comment cleanup 2026-06-01 21:51:18 +00:00
PedroCailleret
5b813a1cc6 Added ERC2771 support & Increased pixTarget max size 2026-06-01 21:51:18 +00:00
PedroCailleret
ede02a0daf cleanup 2026-06-01 21:51:18 +00:00
PedroCailleret
58927624b8 Removed relayer logic 2026-06-01 21:51:18 +00:00
PedroCailleret
84fc3c4350 Inheritance refactoring 2026-06-01 21:51:18 +00:00
PedroCailleret
e9187008a3 Types cleanup 2026-06-01 21:51:18 +00:00
PedroCailleret
9feb38db50 🏗️ 2026-06-01 21:51:18 +00:00
PedroCailleret
ecb3d3d3f0 Cleanup 2026-06-01 21:51:18 +00:00
PedroCailleret
2f008a3cb5 Solidity version bump & viaIR compilation 2026-06-01 21:51:18 +00:00
PedroCailleret
c262095966 Optimized SafeTransferLib (Solady) 2026-06-01 21:51:18 +00:00
PedroCailleret
cdffbd8783 Rearchitected storage 🗃️ 2026-06-01 21:51:18 +00:00
PedroCailleret
a4f2f559cc Errors cleanup 2026-06-01 21:51:18 +00:00
PedroCailleret
aad338eadd Administrative settings example script added. 2026-06-01 21:51:18 +00:00
PedroCailleret
4568cad8f0 Merge pull request #9 from doiim/dev
Merge dev branch updates to main.
2023-02-14 20:26:54 -03:00
3 changed files with 6094 additions and 3001 deletions

View File

@@ -11,7 +11,7 @@ pragma solidity ^0.8.19;
import { OwnerSettings, ERC20, SafeTransferLib } from "contracts/core/OwnerSettings.sol";
import { BaseUtils } from "contracts/core/BaseUtils.sol";
import { DataTypes as DT } from "contracts/core/DataTypes.sol";
import { IPrimusZKTLS, Attestation } from "@primuslabs/zktls-contracts/src/IPrimusZKTLS.sol";
contract P2PIX is BaseUtils {
// solhint-disable use-forbidden-name
@@ -33,8 +33,7 @@ contract P2PIX is BaseUtils {
address[] memory validSigners,
address _reputation,
ERC20[] memory tokens,
bool[] memory tokenStates,
address primusAddress
bool[] memory tokenStates
)
OwnerSettings(
defaultBlocks,

4
deploys/deploy.d.ts vendored
View File

@@ -1,4 +0,0 @@
declare module '*.json' {
const value: any
export default value
}

9086
yarn.lock

File diff suppressed because it is too large Load Diff