Seismic remediations: ERC-3009 plaintext bypass+ encrypted-amount nonce scan

.env.example

@@ -46,7 +46,7 @@ export SONEIUM_TESTNET_VERIFIER_URL="https://soneium-minato.blockscout.com/api"
 
 # Seismic
 # Verifier URL must be the FULL socialscan command_api path, not the bare host.
-export SEISMIC_TESTNET_RPC_URL=https://testnet-1.seismictest.net/rpc
+export SEISMIC_TESTNET_RPC_URL=https://testnet-2.seismictest.net/rpc
 export SEISMIC_TESTNET_VERIFIER_URL=https://api.socialscan.io/seismic-testnet/v1/explorer/command_api/contract
 # Set when Seismic mainnet is live (deploy targets fail closed until then).
 # export SEISMIC_MAINNET_RPC_URL=

script/Config.sol

@@ -31,6 +31,7 @@ contract Config {
         address freezeManager;
         address yieldRecipientManager;
         address pauser;
+        address allowlistAdmin;
     }
 
     struct YieldToOneForcedTransferConfig {
@@ -43,6 +44,7 @@ contract Config {
         address yieldRecipientManager;
         address pauser;
         address forcedTransferManager;
+        address allowlistAdmin;
     }
 
     struct JMIExtensionConfig {
@@ -55,6 +57,7 @@ contract Config {
         address freezeManager;
         address pauser;
         address yieldRecipientManager;
+        address allowlistAdmin;
     }
 
     struct YieldToAllWithFeeConfig {
@@ -97,7 +100,8 @@ contract Config {
     uint256 public constant BASE_SEPOLIA_CHAIN_ID = 84532;
     uint256 public constant SEISMIC_TESTNET_CHAIN_ID = 5124;
 
-    address public constant DEPLOYER = 0x12b1A4226ba7D9Ad492779c924b0fC00BDCb6217;
+    address public constant DEPLOYER = 0xF2f1ACbe0BA726fEE8d75f3E32900526874740BB;
+    address public constant TESTNET_OWNER = 0x12b1A4226ba7D9Ad492779c924b0fC00BDCb6217;
 
     address public constant M_TOKEN = 0x866A2BF4E572CbcF37D5071A7a58503Bfb36be1b;
     address public constant WRAPPED_M_TOKEN = 0x437cc33344a0B27A429f795ff6B469C72698B291;

script/ConfigureSeismicExtension.s.sol

@@ -35,7 +35,10 @@ contract ConfigureSeismicExtension is ScriptBase {
 
         vm.stopBroadcast();
 
-        console.log("Extension approved on SwapFacility:", extension);
+        for (uint256 i; i < infra.length; ++i) {
+            require(IMYieldToOne(extension).isAllowlisted(infra[i]), "allowlist failed");
+        }
+
         console.log("Allowlisted Portal:", infra[0]);
         if (limitOrderProtocol != address(0)) console.log("Allowlisted LimitOrderProtocol:", limitOrderProtocol);
     }

script/decrypt-transfer-event.py

@@ -20,8 +20,11 @@
   --peer-pubkey    the OTHER party's 33-byte compressed public key
   --from           event `from` topic (sender / approver) — bound into the nonce
   --to             event `to` topic (recipient / spender) — bound into the nonce
-  --nonce-counter  the contract's encryptedEventNonce value used for this emit (1-based)
-  --scan           try counters 1..max-n until the GCM tag verifies (when the counter is unknown)
+  --nonce-counter  the encryptedEventNonce for this emit (1-based) — read it straight from the
+                   `EncryptedAmountNonce(from, to, nonce)` event the contract emits alongside the
+                   ciphertext; preferred over --scan
+  --scan           legacy fallback: try counters 1..max-n until the GCM tag verifies, for ciphertexts
+                   from logs that predate the EncryptedAmountNonce event (when the counter is unknown)
   --ciphertext     event payload hex (ciphertext || 16-byte tag)
   --self-test      verify against vectors pinned from the Seismic precompiles (sforge mercury EVM)
 

script/deploy/DeployBase.s.sol

@@ -138,16 +138,7 @@ contract DeployBase is DeployHelpers, ScriptBase {
         proxy = _deployCreate3TransparentProxy(
             implementation,
             extensionConfig.admin,
-            abi.encodeWithSelector(
-                MYieldToOne.initialize.selector,
-                extensionConfig.extensionName,
-                extensionConfig.symbol,
-                extensionConfig.yieldRecipient,
-                extensionConfig.admin,
-                extensionConfig.freezeManager,
-                extensionConfig.yieldRecipientManager,
-                extensionConfig.pauser
-            ),
+            _yieldToOneInitData(extensionConfig),
             _computeSalt(deployer, extensionConfig.contractName)
         );
 
@@ -165,17 +156,7 @@ contract DeployBase is DeployHelpers, ScriptBase {
         proxy = _deployCreate3TransparentProxy(
             implementation,
             extensionConfig.admin,
-            abi.encodeWithSelector(
-                MYieldToOneForcedTransfer.initialize.selector,
-                extensionConfig.extensionName,
-                extensionConfig.symbol,
-                extensionConfig.yieldRecipient,
-                extensionConfig.admin,
-                extensionConfig.freezeManager,
-                extensionConfig.yieldRecipientManager,
-                extensionConfig.pauser,
-                extensionConfig.forcedTransferManager
-            ),
+            _yieldToOneForcedTransferInitData(extensionConfig),
             _computeSalt(deployer, extensionConfig.contractName)
         );
 
@@ -193,23 +174,62 @@ contract DeployBase is DeployHelpers, ScriptBase {
         proxy = _deployCreate3TransparentProxy(
             implementation,
             extensionConfig.admin,
-            abi.encodeWithSelector(
-                JMIExtension.initialize.selector,
-                extensionConfig.extensionName,
-                extensionConfig.symbol,
-                extensionConfig.yieldRecipient,
-                extensionConfig.admin,
-                extensionConfig.assetCapManager,
-                extensionConfig.freezeManager,
-                extensionConfig.pauser,
-                extensionConfig.yieldRecipientManager
-            ),
+            _jmiExtensionInitData(extensionConfig),
             _computeSalt(deployer, extensionConfig.contractName)
         );
 
         proxyAdmin = Upgrades.getAdminAddress(proxy);
     }
 
+    function _yieldToOneInitData(YieldToOneConfig memory c) private pure returns (bytes memory) {
+        return
+            abi.encodeWithSelector(
+                MYieldToOne.initialize.selector,
+                c.extensionName,
+                c.symbol,
+                c.yieldRecipient,
+                c.admin,
+                c.freezeManager,
+                c.yieldRecipientManager,
+                c.pauser,
+                c.allowlistAdmin
+            );
+    }
+
+    function _yieldToOneForcedTransferInitData(
+        YieldToOneForcedTransferConfig memory c
+    ) private pure returns (bytes memory) {
+        return
+            abi.encodeWithSelector(
+                MYieldToOneForcedTransfer.initialize.selector,
+                c.extensionName,
+                c.symbol,
+                c.yieldRecipient,
+                c.admin,
+                c.freezeManager,
+                c.yieldRecipientManager,
+                c.pauser,
+                c.forcedTransferManager,
+                c.allowlistAdmin
+            );
+    }
+
+    function _jmiExtensionInitData(JMIExtensionConfig memory c) private pure returns (bytes memory) {
+        return
+            abi.encodeWithSelector(
+                JMIExtension.initialize.selector,
+                c.extensionName,
+                c.symbol,
+                c.yieldRecipient,
+                c.admin,
+                c.assetCapManager,
+                c.freezeManager,
+                c.pauser,
+                c.yieldRecipientManager,
+                c.allowlistAdmin
+            );
+    }
+
     function _deployYieldToAllWithFee(
         address deployer,
         YieldToAllWithFeeConfig memory extensionConfig

script/deploy/DeployJMIExtension.s.sol

@@ -19,6 +19,7 @@ contract DeployJMIExtension is DeployBase {
         extensionConfig.freezeManager = vm.envAddress("FREEZE_MANAGER");
         extensionConfig.pauser = vm.envAddress("PAUSER");
         extensionConfig.yieldRecipientManager = vm.envAddress("YIELD_RECIPIENT_MANAGER");
+        extensionConfig.allowlistAdmin = vm.envAddress("ALLOWLIST_ADMIN");
 
         // Verify predicted address (if PREDICTED_ADDRESS env var is set)
         if (_shouldVerifyPredictedAddress()) {

script/deploy/DeployYieldToOne.s.sol

@@ -18,6 +18,7 @@ contract DeployYieldToOne is DeployBase {
         extensionConfig.freezeManager = vm.envAddress("FREEZE_MANAGER");
         extensionConfig.yieldRecipientManager = vm.envAddress("YIELD_RECIPIENT_MANAGER");
         extensionConfig.pauser = vm.envAddress("PAUSER");
+        extensionConfig.allowlistAdmin = vm.envAddress("ALLOWLIST_ADMIN");
 
         // Verify predicted address (if PREDICTED_ADDRESS env var is set)
         if (_shouldVerifyPredictedAddress()) {

script/deploy/DeployYieldToOneForcedTransfer.s.sol

@@ -19,6 +19,7 @@ contract DeployYieldToOneForcedTransfer is DeployBase {
         extensionConfig.yieldRecipientManager = vm.envAddress("YIELD_RECIPIENT_MANAGER");
         extensionConfig.pauser = vm.envAddress("PAUSER");
         extensionConfig.forcedTransferManager = vm.envAddress("FORCED_TRANSFER_MANAGER");
+        extensionConfig.allowlistAdmin = vm.envAddress("ALLOWLIST_ADMIN");
 
         // Verify predicted address (if PREDICTED_ADDRESS env var is set)
         if (_shouldVerifyPredictedAddress()) {

src/projects/jmi/JMIExtension.sol

@@ -105,6 +105,7 @@ contract JMIExtension is IJMIExtension, JMIExtensionLayout, MYieldToOne {
      * @param freezeManager         The address of a freeze manager.
      * @param pauser                The address of a pauser.
      * @param yieldRecipientManager The address of a yield recipient manager.
+     * @param allowlistAdmin        The address granted the allowlist admin role (manages the allowlist-manager role).
      */
     function initialize(
         string memory name,
@@ -114,7 +115,8 @@ contract JMIExtension is IJMIExtension, JMIExtensionLayout, MYieldToOne {
         address assetCapManager,
         address freezeManager,
         address pauser,
-        address yieldRecipientManager
+        address yieldRecipientManager,
+        address allowlistAdmin
     ) public virtual initializer {
         __JMIExtension_init(
             name,
@@ -124,7 +126,8 @@ contract JMIExtension is IJMIExtension, JMIExtensionLayout, MYieldToOne {
             assetCapManager,
             freezeManager,
             pauser,
-            yieldRecipientManager
+            yieldRecipientManager,
+            allowlistAdmin
         );
     }
 
@@ -138,6 +141,7 @@ contract JMIExtension is IJMIExtension, JMIExtensionLayout, MYieldToOne {
      * @param freezeManager         The address of a freeze manager.
      * @param pauser                The address of a pauser.
      * @param yieldRecipientManager The address of a yield recipient setter.
+     * @param allowlistAdmin        The address granted the allowlist admin role (manages the allowlist-manager role).
      */
     function __JMIExtension_init(
         string memory name,
@@ -147,11 +151,21 @@ contract JMIExtension is IJMIExtension, JMIExtensionLayout, MYieldToOne {
         address assetCapManager,
         address freezeManager,
         address pauser,
-        address yieldRecipientManager
+        address yieldRecipientManager,
+        address allowlistAdmin
     ) internal onlyInitializing {
         if (assetCapManager == address(0)) revert ZeroAssetCapManager();
 
-        __MYieldToOne_init(name, symbol, yieldRecipient, admin, freezeManager, yieldRecipientManager, pauser);
+        __MYieldToOne_init(
+            name,
+            symbol,
+            yieldRecipient,
+            admin,
+            freezeManager,
+            yieldRecipientManager,
+            pauser,
+            allowlistAdmin
+        );
 
         _grantRole(ASSET_CAP_MANAGER_ROLE, assetCapManager);
     }