41 Commits

Author SHA1 Message Date
hueso
a63b58e741 Primus zkTLS test 2026-04-24 14:11:24 -03:00
hueso
4bf8841a89 OZ v5.5.0 2026-03-27 14:23:12 -03:00
hueso
0151910b0d bump OZ version to 5.5.0-rc.1 2026-03-27 14:23:12 -03:00
hueso
7a2aec7e71 restore trustedForwarders as an OZ override 2026-03-27 14:23:12 -03:00
hueso
5737ab1623 import ECDSA, ERC2771, ERC20, MerkleProofLib from @openzeppelin 2026-03-27 14:23:12 -03:00
hueso
183db96fda WIP: use openzeppelin contracts 2026-03-27 14:23:12 -03:00
filipesoccol
7f6efc4cb6 Merge pull request #10 from jeffmant/dev
Refactoring and code improvements | by @hueso
2025-10-03 16:24:56 -03:00
hueso
e57428525b updated RPC urls 2025-08-02 21:10:31 -03:00
hueso
538258a709 rootstock testnet re-deployment 2025-08-02 21:10:31 -03:00
hueso
30335bbe5b bump solidity verison 2025-08-02 21:10:31 -03:00
hueso
f924593ee2 Ethers v5 -> v6 migration
Updated dependencies and removed unused ones.
2025-08-02 21:09:40 -03:00
hueso
811d5344a3 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
2025-06-11 11:55:24 -03:00
hueso
4f1f8d6025 sepolia deployment 2024-07-18 17:59:44 -03:00
hueso
c25fa24b2f ditch amount hardcodings 2024-03-03 21:53:48 -03:00
hueso
4f63d17eb1 set deposit() nonReentrant 2024-02-29 20:09:54 -03:00
hueso
d27bdda15e update tests for current function parameters 2024-02-29 19:53:12 -03:00
hueso
1ffa9c6b5c update documentation 2024-02-13 16:35:16 -03:00
hueso
f02dad07c8 restore function parameters. reverts 26a4952 2024-02-13 15:13:36 -03:00
hueso
db7407e299 add RSK networks 2024-02-13 13:26:39 -03:00
hueso
e95828b7dd ERC2771 compatibility 2023-09-05 00:40:18 -03:00
hueso
a3e6aa5879 add artifacts to .gitignore 2023-09-04 18:02:33 -03:00
hueso
f5f9923833 mark assembly blocks as memory-safe 2023-09-04 18:00:19 -03:00
hueso
b571d6c47e use ERC20 datatype 2023-09-04 18:00:19 -03:00
hueso
95463cdfa3 revamped lock() conditionals 2023-09-04 18:00:09 -03:00
PedroCailleret
1a91b64024 increased lock gas savings 2023-06-05 22:04:46 -03:00
PedroCailleret
631c1d5dfb Added support for flatsigs 2023-05-22 07:43:47 -03:00
PedroCailleret
26a495246e Moved stack allocation from memory to calldata 2023-05-22 06:40:53 -03:00
PedroCailleret
4281526d77 🔧 Inheritance reordering 2023-05-21 02:40:42 -03:00
PedroCailleret
28245db8dd Comment cleanup 2023-05-21 02:26:24 -03:00
PedroCailleret
32469e2480 Added ERC2771 support & Increased pixTarget max size 2023-05-21 02:05:43 -03:00
PedroCailleret
2129566a27 cleanup 2023-05-20 00:49:54 -03:00
PedroCailleret
c927f741e6 Removed relayer logic 2023-05-19 21:22:29 -03:00
PedroCailleret
ce5f3e4265 Inheritance refactoring 2023-05-19 05:14:11 -03:00
PedroCailleret
440048453b Types cleanup 2023-05-19 00:49:29 -03:00
PedroCailleret
0b9b0307d2 🏗️ 2023-05-16 21:09:39 -03:00
PedroCailleret
545887baec Cleanup 2023-05-15 00:16:36 -03:00
PedroCailleret
d8147bd58e Solidity version bump & viaIR compilation 2023-05-14 22:31:12 -03:00
PedroCailleret
8ebef3aaf1 Optimized SafeTransferLib (Solady) 2023-05-14 21:26:08 -03:00
PedroCailleret
9d14f053d5 Rearchitected storage 🗃️ 2023-05-14 20:44:18 -03:00
PedroCailleret
6a3bea432c Errors cleanup 2023-05-08 16:17:32 -03:00
PedroCailleret
a0e39bafab Administrative settings example script added. 2023-02-15 22:08:18 -03:00
3 changed files with 3001 additions and 6094 deletions

View File

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

4
deploys/deploy.d.ts vendored Normal file
View File

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

9086
yarn.lock

File diff suppressed because it is too large Load Diff