From 9565fca743096aa11dc6f04f2e4071a33f6cfdb3 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Thu, 5 Feb 2026 15:32:28 +0400 Subject: [PATCH 1/4] hash dep update --- flake.lock | 59 ++++++++++++++++++++++++++++++----------------- foundry.lock | 2 +- lib/rain.lib.hash | 2 +- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 894a168..b88de52 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758705030, - "narHash": "sha256-zYM8PiEXANNrtjfyGUc7w37/D/kCynp0cQS+wCQ77GI=", + "lastModified": 1769324704, + "narHash": "sha256-aef15vEgiMEls1hTMt46rJuKNSO2cIOfiP99patq9yc=", "owner": "shazow", "repo": "foundry.nix", - "rev": "b59a55014050110170023e3e1c277c1d4a2f055b", + "rev": "e830409ba1bdecdc5ef9a1ec92660fc2da9bc68d", "type": "github" }, "original": { @@ -102,13 +102,29 @@ "type": "indirect" } }, + "nixpkgs-old": { + "locked": { + "lastModified": 1749104371, + "narHash": "sha256-m2NmOPd6XgBiskmUq/BS9Xxuf3z0ebnGVfSKNAO5NEM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "48975d7f9b9960ed33c4e8561bcce20cc0c2de5b", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "48975d7f9b9960ed33c4e8561bcce20cc0c2de5b", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1758711836, - "narHash": "sha256-uBqPg7wNX2v6YUdTswH7wWU8wqb60cFZx0tHaWTGF30=", + "lastModified": 1769364508, + "narHash": "sha256-Wy8EVYSLq5Fb/rYH3LRxAMCnW75f9hOg2562AXVFmPk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46f97b78e825ae762c0224e3983c47687436a498", + "rev": "6077bc4fb29be43d525984f63b69d37b9b1e62fe", "type": "github" }, "original": { @@ -135,11 +151,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1748662220, - "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", + "lastModified": 1766653575, + "narHash": "sha256-TPgxCS7+hWc4kPhzkU5dD2M5UuPhLuuaMNZ/IpwKQvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "rev": "3c1016e6acd16ad96053116d0d3043029c9e2649", "type": "github" }, "original": { @@ -154,15 +170,16 @@ "flake-utils": "flake-utils_2", "foundry": "foundry", "nixpkgs": "nixpkgs_2", + "nixpkgs-old": "nixpkgs-old", "rust-overlay": "rust-overlay", "solc": "solc" }, "locked": { - "lastModified": 1760460761, - "narHash": "sha256-IHvwnmphDaOyZnzvObwOoDQlA9nzym2ZUxe9K/5vs0U=", + "lastModified": 1770274701, + "narHash": "sha256-00kymonJVHUtCBBaXMqmVF3b78dtDdXJg8K7P2U9lbA=", "owner": "rainprotocol", "repo": "rainix", - "rev": "add0d8a1fd76ce0e65b962c952e9252257876465", + "rev": "51c1c74a0e6bc5c49336b02ef97684d01e1e8ad4", "type": "github" }, "original": { @@ -182,11 +199,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758681214, - "narHash": "sha256-8cW731vev6kfr58cILO2ZsjHwaPhm88dQ8Q6nTSjP9I=", + "lastModified": 1769309768, + "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b12ed88d8d33d4f3cbc842bf29fad93bb1437299", + "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", "type": "github" }, "original": { @@ -202,11 +219,11 @@ "solc-macos-amd64-list-json": "solc-macos-amd64-list-json" }, "locked": { - "lastModified": 1756368702, - "narHash": "sha256-cqEHv7uCV0LibmQphyiXZ1+jYtGjMNb9Pae4tfcAcF8=", + "lastModified": 1768831671, + "narHash": "sha256-0mmlYRtZK+eomevkQCCH7PL8QlSuALZQsjLroCWGE08=", "owner": "hellwolf", "repo": "solc.nix", - "rev": "d83e90df2fa8359a690f6baabf76099432193c3f", + "rev": "80ad871b93d15c7bccf71617f78f73c2d291a9c7", "type": "github" }, "original": { @@ -218,13 +235,13 @@ "solc-macos-amd64-list-json": { "flake": false, "locked": { - "narHash": "sha256-AvITkfpNYgCypXuLJyqco0li+unVw39BAfdOZvd/SPE=", + "narHash": "sha256-P+ZslplK4cQ/wnV/wykVKb+yTCviI0eylA3sk9uHmRo=", "type": "file", - "url": "https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json" + "url": "https://github.com/argotorg/solc-bin/raw/a11f1ad/macosx-amd64/list.json" }, "original": { "type": "file", - "url": "https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json" + "url": "https://github.com/argotorg/solc-bin/raw/a11f1ad/macosx-amd64/list.json" } }, "systems": { diff --git a/foundry.lock b/foundry.lock index 0ee7da7..dfeb691 100644 --- a/foundry.lock +++ b/foundry.lock @@ -3,7 +3,7 @@ "rev": "b8f065fda83b8cd94a6b2fec8fcd911dc3b444fd" }, "lib/rain.lib.hash": { - "rev": "9677b7063fc9ae8c580636760474719d910c2134" + "rev": "a4f6df6fb74b7d14d94fb8f0477888cc23616bc3" }, "lib/rain.solmem": { "rev": "f28da2f09d42d154783cb53c138a7ef2f3a9eb4a" diff --git a/lib/rain.lib.hash b/lib/rain.lib.hash index 9677b70..a4f6df6 160000 --- a/lib/rain.lib.hash +++ b/lib/rain.lib.hash @@ -1 +1 @@ -Subproject commit 9677b7063fc9ae8c580636760474719d910c2134 +Subproject commit a4f6df6fb74b7d14d94fb8f0477888cc23616bc3 From f792b2951e0473dc0634fa84dd087437b44b19c3 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Thu, 5 Feb 2026 15:33:30 +0400 Subject: [PATCH 2/4] solmem dep --- foundry.lock | 2 +- lib/rain.solmem | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/foundry.lock b/foundry.lock index dfeb691..cb44cff 100644 --- a/foundry.lock +++ b/foundry.lock @@ -6,6 +6,6 @@ "rev": "a4f6df6fb74b7d14d94fb8f0477888cc23616bc3" }, "lib/rain.solmem": { - "rev": "f28da2f09d42d154783cb53c138a7ef2f3a9eb4a" + "rev": "2e47e41af85a711d837b2518656db0efdae814c2" } } \ No newline at end of file diff --git a/lib/rain.solmem b/lib/rain.solmem index f28da2f..2e47e41 160000 --- a/lib/rain.solmem +++ b/lib/rain.solmem @@ -1 +1 @@ -Subproject commit f28da2f09d42d154783cb53c138a7ef2f3a9eb4a +Subproject commit 2e47e41af85a711d837b2518656db0efdae814c2 From 061d1f35ae6512443608e174443ee3392bd6a3a8 Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Thu, 5 Feb 2026 15:34:03 +0400 Subject: [PATCH 3/4] forge update --- foundry.lock | 2 +- lib/forge-std | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/foundry.lock b/foundry.lock index cb44cff..61ddc58 100644 --- a/foundry.lock +++ b/foundry.lock @@ -1,6 +1,6 @@ { "lib/forge-std": { - "rev": "b8f065fda83b8cd94a6b2fec8fcd911dc3b444fd" + "rev": "1801b0541f4fda118a10798fd3486bb7051c5dd6" }, "lib/rain.lib.hash": { "rev": "a4f6df6fb74b7d14d94fb8f0477888cc23616bc3" diff --git a/lib/forge-std b/lib/forge-std index b8f065f..1801b05 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit b8f065fda83b8cd94a6b2fec8fcd911dc3b444fd +Subproject commit 1801b0541f4fda118a10798fd3486bb7051c5dd6 From d9dbdd03c684a8ef491e971bf62f4400bbcefbbc Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Thu, 5 Feb 2026 16:11:07 +0400 Subject: [PATCH 4/4] fmt --- src/lib/LibMemoryKV.sol | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/LibMemoryKV.sol b/src/lib/LibMemoryKV.sol index 35407bc..f37d43e 100644 --- a/src/lib/LibMemoryKV.sol +++ b/src/lib/LibMemoryKV.sol @@ -99,12 +99,11 @@ library LibMemoryKV { // kv must point to new insertion. //slither-disable-next-line incorrect-shift - kv := - or( - shl(bitOffset, pointer), - // Mask out the old pointer - and(kv, not(shl(bitOffset, 0xFFFF))) - ) + kv := or( + shl(bitOffset, pointer), + // Mask out the old pointer + and(kv, not(shl(bitOffset, 0xFFFF))) + ) } } return kv;