@rhinestone/shared-configs 2.15.1 → 2.16.0

package/dist/configs/contracts.dev.json

@@ -15,7 +15,9 @@
         "ecoPortal": "0xEC000064576f9C95a8623Bc0eff3db6d296ea6df",
         "ecoHyperProver": "0xeC0008acc34d3D0CAa6758Ce788091e473812e28",
         "ecoVaultAddress": "0x9f70b0c839fe2D7190A09Ae87ED658b6D1CbA4F9",
-        "oftProxy": "0x5B64E414f4dEA97062D6B552852FFbAcaf6d462b"
+        "oftProxy": "0x5B64E414f4dEA97062D6B552852FFbAcaf6d462b",
+        "swapAdapter": "0x58BC7d9279A38a1537c2f74426dBDbD804AD3A18",
+        "swapAdapterTokenSpender": "0xc5f6641b3ade357c5df77a1859d16528fe8b3e93"
     },
     "56": {
         "ecoArbiter": "0x1BeBAfb3D05d84A5Bfd94800c88d1342f755d8AB",
@@ -79,7 +81,9 @@
         "spokepool": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
         "ecoPortal": "0xEC000064576f9C95a8623Bc0eff3db6d296ea6df",
         "ecoHyperProver": "0xeC0008acc34d3D0CAa6758Ce788091e473812e28",
-        "ecoVaultAddress": "0x9f70b0c839fe2D7190A09Ae87ED658b6D1CbA4F9"
+        "ecoVaultAddress": "0x9f70b0c839fe2D7190A09Ae87ED658b6D1CbA4F9",
+        "swapAdapter": "0x58BC7d9279A38a1537c2f74426dBDbD804AD3A18",
+        "swapAdapterTokenSpender": "0xc5f6641b3ade357c5df77a1859d16528fe8b3e93"
     },
     "9745": {
         "ecoArbiter": "0x1BeBAfb3D05d84A5Bfd94800c88d1342f755d8AB",

package/dist/scripts/__tests__/hoistUniform.test.js

@@ -38,6 +38,22 @@ const resolve = (contracts, chainId) => ({
         (0, bun_test_1.expect)(out["1"].oftProxy).toBe("0x11");
         (0, bun_test_1.expect)(out["*"].permit2).toBe("0xAA");
     });
+    (0, bun_test_1.test)("keeps staged deployment addresses chain-scoped", () => {
+        const out = (0, hoistUniform_1.hoistUniformAddresses)({
+            "10": {
+                swapAdapter: "0xAA",
+                swapAdapterTokenSpender: "0xBB",
+            },
+            "8453": {
+                swapAdapter: "0xAA",
+                swapAdapterTokenSpender: "0xBB",
+            },
+        });
+        (0, bun_test_1.expect)(out["*"]?.swapAdapter).toBeUndefined();
+        (0, bun_test_1.expect)(out["*"]?.swapAdapterTokenSpender).toBeUndefined();
+        (0, bun_test_1.expect)(out["10"].swapAdapter).toBe("0xAA");
+        (0, bun_test_1.expect)(out["8453"].swapAdapterTokenSpender).toBe("0xBB");
+    });
     (0, bun_test_1.test)("resolution is unchanged for every chain that already had the key", () => {
         const before = {
             "*": { router: "0xRR" },

package/dist/scripts/generate.js

@@ -325,6 +325,8 @@ const mapChainDeployments = (deployments, external) => {
         // external/derived address, so it's mapped here (RHI-4896).
         swapper: deployments.swapper,
         tokenTransferProxy: external?.tokenTransferProxy?.address,
+        swapAdapter: external?.swapAdapter?.address,
+        swapAdapterTokenSpender: external?.swapAdapterTokenSpender?.address,
     });
 };
 function collectContracts(addrConfig) {

package/dist/scripts/hoistUniform.d.ts

@@ -1,30 +1,2 @@
 export type RawContracts = Record<string, Record<string, string>>;
-/**
- * Hoist every address that is identical on all chains carrying it into the `*`
- * wildcard, leaving each chain with only what genuinely differs there.
- *
- * Consumers resolve a chain as `{ ...wildcard, ...chainSpecific }`, so this
- * changes nothing for a chain that already had the key. What it changes is the
- * chain the map has never heard of: chains now arrive at runtime in the facts
- * artifact while this map is baked into the consumer's image, so a new chain
- * falls back to the bare wildcard and every address missing from it resolves to
- * `undefined`. That is not theoretical — it is why the first quote to Ink 500'd
- * (RHI-5703): `permit2` was absent from the wildcard, so a `spender: undefined`
- * reached viem, which threw inside a `catch` that then discarded the chain.
- *
- * Hoisted only with evidence: at least two chains carrying the key, and exactly
- * one distinct address between them. One chain proves nothing about uniformity,
- * and a key whose value varies is genuinely per-chain (`spokepool` has 16
- * distinct addresses across 18 chains, `oftProxy` 7 across 7).
- *
- * Keys that split by *network* rather than by chain are deliberately left
- * per-chain — the eco family is one mainnet address and one testnet address.
- * A single wildcard value would hand a new testnet the mainnet portal, and a
- * confidently wrong address is worse than a missing one.
- *
- * Note this widens resolution: a chain that never had `acrossHandler` now
- * resolves one. Capability is gated by `settlementLayers` in the registry, not
- * by the presence of a key here, so that is safe — but it does mean this file
- * stops being a record of what is deployed where.
- */
 export declare const hoistUniformAddresses: (contracts: RawContracts) => RawContracts;

package/dist/scripts/hoistUniform.js

@@ -29,6 +29,12 @@ exports.hoistUniformAddresses = void 0;
  * by the presence of a key here, so that is safe — but it does mean this file
  * stops being a record of what is deployed where.
  */
+const CHAIN_SCOPED_KEYS = {
+    // Staged rollout: identical CREATE2 address does not prove deployment on an
+    // unknown chain. Keep these absent until that chain is explicitly enabled.
+    swapAdapter: true,
+    swapAdapterTokenSpender: true,
+};
 const hoistUniformAddresses = (contracts) => {
     const perChain = Object.entries(contracts).filter(([id]) => id !== "*");
     const addressesByKey = new Map();
@@ -41,7 +47,9 @@ const hoistUniformAddresses = (contracts) => {
     }
     const chainsCarrying = (key) => perChain.filter(([, entries]) => key in entries).length;
     const uniform = [...addressesByKey.entries()]
-        .filter(([key, addresses]) => addresses.size === 1 && chainsCarrying(key) > 1)
+        .filter(([key, addresses]) => !(key in CHAIN_SCOPED_KEYS) &&
+        addresses.size === 1 &&
+        chainsCarrying(key) > 1)
         .map(([key]) => key);
     if (uniform.length === 0) {
         return contracts;

package/dist/src/generated/contracts.dev.js

@@ -18,7 +18,9 @@ const contractAddresses = {
         "ecoPortal": "0xEC000064576f9C95a8623Bc0eff3db6d296ea6df",
         "ecoHyperProver": "0xeC0008acc34d3D0CAa6758Ce788091e473812e28",
         "ecoVaultAddress": "0x9f70b0c839fe2D7190A09Ae87ED658b6D1CbA4F9",
-        "oftProxy": "0x5B64E414f4dEA97062D6B552852FFbAcaf6d462b"
+        "oftProxy": "0x5B64E414f4dEA97062D6B552852FFbAcaf6d462b",
+        "swapAdapter": "0x58BC7d9279A38a1537c2f74426dBDbD804AD3A18",
+        "swapAdapterTokenSpender": "0xc5f6641b3ade357c5df77a1859d16528fe8b3e93"
     },
     "56": {
         "ecoArbiter": "0x1BeBAfb3D05d84A5Bfd94800c88d1342f755d8AB",
@@ -82,7 +84,9 @@ const contractAddresses = {
         "spokepool": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
         "ecoPortal": "0xEC000064576f9C95a8623Bc0eff3db6d296ea6df",
         "ecoHyperProver": "0xeC0008acc34d3D0CAa6758Ce788091e473812e28",
-        "ecoVaultAddress": "0x9f70b0c839fe2D7190A09Ae87ED658b6D1CbA4F9"
+        "ecoVaultAddress": "0x9f70b0c839fe2D7190A09Ae87ED658b6D1CbA4F9",
+        "swapAdapter": "0x58BC7d9279A38a1537c2f74426dBDbD804AD3A18",
+        "swapAdapterTokenSpender": "0xc5f6641b3ade357c5df77a1859d16528fe8b3e93"
     },
     "9745": {
         "ecoArbiter": "0x1BeBAfb3D05d84A5Bfd94800c88d1342f755d8AB",

package/dist/src/generated/packageVersion.d.ts

@@ -1,2 +1,2 @@
-declare const PACKAGE_VERSION = "2.15.1";
+declare const PACKAGE_VERSION = "2.16.0";
 export { PACKAGE_VERSION };

package/dist/src/generated/packageVersion.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_VERSION = void 0;
 // Auto-generated by scripts/generate.ts. Do not edit manually.
-const PACKAGE_VERSION = "2.15.1";
+const PACKAGE_VERSION = "2.16.0";
 exports.PACKAGE_VERSION = PACKAGE_VERSION;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/shared-configs",
-  "version": "2.15.1",
+  "version": "2.16.0",
   "description": "Reusable configuration files for Rhinestone services",
   "author": {
     "name": "Rhinestone",