@gearbox-protocol/deploy-tools 5.30.0 → 5.30.1

package/dist/index.mjs

@@ -4276,7 +4276,7 @@ var init_size = __esm({
 var version2;
 var init_version2 = __esm({
   "../../node_modules/viem/_esm/errors/version.js"() {
-    version2 = "2.29.2";
+    version2 = "2.29.3";
   }
 });
 
@@ -5568,9 +5568,9 @@ var init_getAddress = __esm({
 // ../../node_modules/viem/_esm/utils/address/isAddress.js
 function isAddress(address, options) {
   const { strict = true } = options ?? {};
-  const cacheKey3 = `${address}.${strict}`;
-  if (isAddressCache.has(cacheKey3))
-    return isAddressCache.get(cacheKey3);
+  const cacheKey2 = `${address}.${strict}`;
+  if (isAddressCache.has(cacheKey2))
+    return isAddressCache.get(cacheKey2);
   const result = (() => {
     if (!addressRegex.test(address))
       return false;
@@ -5580,7 +5580,7 @@ function isAddress(address, options) {
       return checksumAddress(address) === address;
     return true;
   })();
-  isAddressCache.set(cacheKey3, result);
+  isAddressCache.set(cacheKey2, result);
   return result;
 }
 var addressRegex, isAddressCache;
@@ -24329,7 +24329,7 @@ var require_common = __commonJS({
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        const split3 = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+        const split3 = (typeof namespaces === "string" ? namespaces : "").trim().replace(/\s+/g, ",").split(",").filter(Boolean);
         for (const ns of split3) {
           if (ns[0] === "-") {
             createDebug.skips.push(ns.slice(1));
@@ -24547,7 +24547,7 @@ var require_browser = __commonJS({
     function load() {
       let r;
       try {
-        r = exports2.storage.getItem("debug");
+        r = exports2.storage.getItem("debug") || exports2.storage.getItem("DEBUG");
       } catch (error) {
       }
       if (!r && typeof process !== "undefined" && "env" in process) {
@@ -75247,24 +75247,24 @@ var require_memoize = __commonJS({
       const cache = {};
       let iterationCounter = 0;
       return async (...args) => {
-        const cacheKey3 = await cacheKeyBuilder(...args);
-        (0, errors_1.assertWithLog)(cacheKey3.length < EXPECTED_MAX_CACHE_KEY_LENGTH_PER_FN, `Assumed cache key will not be longer than ${EXPECTED_MAX_CACHE_KEY_LENGTH_PER_FN}. Suspicious key ${cacheKey3}`);
+        const cacheKey2 = await cacheKeyBuilder(...args);
+        (0, errors_1.assertWithLog)(cacheKey2.length < EXPECTED_MAX_CACHE_KEY_LENGTH_PER_FN, `Assumed cache key will not be longer than ${EXPECTED_MAX_CACHE_KEY_LENGTH_PER_FN}. Suspicious key ${cacheKey2}`);
         iterationCounter = (iterationCounter + 1) % cleanEveryNIteration;
         if (iterationCounter == 0) {
           cleanStaleCacheEntries(cache, ttl);
         }
-        const isMiss = !cache[cacheKey3] || Date.now() - cache[cacheKey3].lastSet > ttl;
+        const isMiss = !cache[cacheKey2] || Date.now() - cache[cacheKey2].lastSet > ttl;
         if (isMiss) {
-          cache[cacheKey3] = {
+          cache[cacheKey2] = {
             lastSet: Date.now(),
             promise: functionToMemoize(...args).catch((err) => {
-              delete cache[cacheKey3];
+              delete cache[cacheKey2];
               throw err;
             })
           };
         }
         cacheReporter(isMiss);
-        return await cache[cacheKey3].promise;
+        return await cache[cacheKey2].promise;
       };
     }
     var cleanStaleCacheEntries = (cache, ttl) => {
@@ -163871,7 +163871,7 @@ var require_version28 = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.version = void 0;
-    exports2.version = "2.29.2";
+    exports2.version = "2.29.3";
   }
 });
 
@@ -165512,9 +165512,9 @@ var require_isAddress = __commonJS({
     exports2.isAddressCache = new lru_js_1.LruMap(8192);
     function isAddress2(address, options) {
       const { strict = true } = options ?? {};
-      const cacheKey3 = `${address}.${strict}`;
-      if (exports2.isAddressCache.has(cacheKey3))
-        return exports2.isAddressCache.get(cacheKey3);
+      const cacheKey2 = `${address}.${strict}`;
+      if (exports2.isAddressCache.has(cacheKey2))
+        return exports2.isAddressCache.get(cacheKey2);
       const result = (() => {
         if (!addressRegex3.test(address))
           return false;
@@ -165524,7 +165524,7 @@ var require_isAddress = __commonJS({
           return (0, getAddress_js_1.checksumAddress)(address) === address;
         return true;
       })();
-      exports2.isAddressCache.set(cacheKey3, result);
+      exports2.isAddressCache.set(cacheKey2, result);
       return result;
     }
   }
@@ -177259,14 +177259,14 @@ var require_withCache = __commonJS({
     exports2.withCache = withCache2;
     exports2.promiseCache = /* @__PURE__ */ new Map();
     exports2.responseCache = /* @__PURE__ */ new Map();
-    function getCache2(cacheKey3) {
-      const buildCache = (cacheKey4, cache) => ({
-        clear: () => cache.delete(cacheKey4),
-        get: () => cache.get(cacheKey4),
-        set: (data) => cache.set(cacheKey4, data)
+    function getCache2(cacheKey2) {
+      const buildCache = (cacheKey3, cache) => ({
+        clear: () => cache.delete(cacheKey3),
+        get: () => cache.get(cacheKey3),
+        set: (data) => cache.set(cacheKey3, data)
       });
-      const promise = buildCache(cacheKey3, exports2.promiseCache);
-      const response = buildCache(cacheKey3, exports2.responseCache);
+      const promise = buildCache(cacheKey2, exports2.promiseCache);
+      const response = buildCache(cacheKey2, exports2.responseCache);
       return {
         clear: () => {
           promise.clear();
@@ -177276,8 +177276,8 @@ var require_withCache = __commonJS({
         response
       };
     }
-    async function withCache2(fn, { cacheKey: cacheKey3, cacheTime = Number.POSITIVE_INFINITY }) {
-      const cache = getCache2(cacheKey3);
+    async function withCache2(fn, { cacheKey: cacheKey2, cacheTime = Number.POSITIVE_INFINITY }) {
+      const cache = getCache2(cacheKey2);
       const response = cache.response.get();
       if (response && cacheTime > 0) {
         const age = (/* @__PURE__ */ new Date()).getTime() - response.created.getTime();
@@ -177308,14 +177308,14 @@ var require_getBlockNumber = __commonJS({
     exports2.getBlockNumberCache = getBlockNumberCache;
     exports2.getBlockNumber = getBlockNumber2;
     var withCache_js_1 = require_withCache();
-    var cacheKey3 = (id) => `blockNumber.${id}`;
+    var cacheKey2 = (id) => `blockNumber.${id}`;
     function getBlockNumberCache(id) {
-      return (0, withCache_js_1.getCache)(cacheKey3(id));
+      return (0, withCache_js_1.getCache)(cacheKey2(id));
     }
     async function getBlockNumber2(client, { cacheTime = client.cacheTime } = {}) {
       const blockNumberHex = await (0, withCache_js_1.withCache)(() => client.request({
         method: "eth_blockNumber"
-      }), { cacheKey: cacheKey3(client.uid), cacheTime });
+      }), { cacheKey: cacheKey2(client.uid), cacheTime });
       return BigInt(blockNumberHex);
     }
   }
@@ -186406,7 +186406,7 @@ var require_multicall2 = __commonJS({
     var getAction_js_1 = require_getAction();
     var readContract_js_1 = require_readContract();
     async function multicall2(client, parameters) {
-      const { allowFailure = true, batchSize: batchSize_, blockNumber, blockTag, multicallAddress: multicallAddress_, stateOverride } = parameters;
+      const { account, allowFailure = true, batchSize: batchSize_, blockNumber, blockTag, multicallAddress: multicallAddress_, stateOverride } = parameters;
       const contracts2 = parameters.contracts;
       const batchSize = batchSize_ ?? (typeof client.batch?.multicall === "object" && client.batch.multicall.batchSize || 1024);
       let multicallAddress = multicallAddress_;
@@ -186446,7 +186446,8 @@ var require_multicall2 = __commonJS({
             address,
             args,
             docsPath: "/docs/contract/multicall",
-            functionName
+            functionName,
+            sender: account
           });
           if (!allowFailure)
             throw error;
@@ -186462,6 +186463,7 @@ var require_multicall2 = __commonJS({
       }
       const aggregate3Results = await Promise.allSettled(chunkedCalls.map((calls) => (0, getAction_js_1.getAction)(client, readContract_js_1.readContract, "readContract")({
         abi: abis_js_1.multicall3Abi,
+        account,
         address: multicallAddress,
         args: [calls],
         blockNumber,
@@ -191957,7 +191959,7 @@ var require_sendCalls = __commonJS({
     var toHex_js_1 = require_toHex();
     var getTransactionError_js_1 = require_getTransactionError();
     async function sendCalls2(client, parameters) {
-      const { account: account_ = client.account, chain = client.chain, forceAtomic = false, id, version: version4 = "2.0.0" } = parameters;
+      const { account: account_ = client.account, capabilities, chain = client.chain, forceAtomic = false, id, version: version4 = "2.0.0" } = parameters;
       if (typeof account_ === "undefined")
         throw new account_js_1.AccountNotFoundError({
           docsPath: "/docs/actions/wallet/sendCalls"
@@ -191983,7 +191985,7 @@ var require_sendCalls = __commonJS({
             {
               atomicRequired: forceAtomic,
               calls,
-              capabilities: formatRequestCapabilities2(parameters.capabilities),
+              capabilities,
               chainId: (0, toHex_js_1.numberToHex)(chain.id),
               from: account?.address,
               id,
@@ -192002,18 +192004,6 @@ var require_sendCalls = __commonJS({
         });
       }
     }
-    function formatRequestCapabilities2(capabilities) {
-      const paymasterService = capabilities?.paymasterService ? Object.entries(capabilities.paymasterService).reduce((paymasterService2, [chainId, value]) => ({
-        ...paymasterService2 ?? {},
-        [(0, toHex_js_1.numberToHex)(Number(chainId))]: value
-      }), {}) : void 0;
-      return {
-        ...capabilities,
-        ...paymasterService ? {
-          paymasterService
-        } : {}
-      };
-    }
   }
 });
 
@@ -243395,27 +243385,12 @@ var require_modular3 = __commonJS({
     var _4n3 = /* @__PURE__ */ BigInt(4);
     var _5n2 = /* @__PURE__ */ BigInt(5);
     var _8n2 = /* @__PURE__ */ BigInt(8);
-    var _9n2 = /* @__PURE__ */ BigInt(9);
-    var _16n2 = /* @__PURE__ */ BigInt(16);
     function mod2(a, b) {
       const result = a % b;
       return result >= _0n8 ? result : b + result;
     }
     function pow3(num2, power, modulo) {
-      if (power < _0n8)
-        throw new Error("invalid exponent, negatives unsupported");
-      if (modulo <= _0n8)
-        throw new Error("invalid modulus");
-      if (modulo === _1n8)
-        return _0n8;
-      let res = _1n8;
-      while (power > _0n8) {
-        if (power & _1n8)
-          res = res * num2 % modulo;
-        num2 = num2 * num2 % modulo;
-        power >>= _1n8;
-      }
-      return res;
+      return FpPow2(Field2(modulo), num2, power);
     }
     function pow22(x, power, modulo) {
       let res = x;
@@ -243445,7 +243420,27 @@ var require_modular3 = __commonJS({
         throw new Error("invert: does not exist");
       return mod2(x, modulo);
     }
+    function sqrt3mod4(Fp, n) {
+      const p1div4 = (Fp.ORDER + _1n8) / _4n3;
+      const root2 = Fp.pow(n, p1div4);
+      if (!Fp.eql(Fp.sqr(root2), n))
+        throw new Error("Cannot find square root");
+      return root2;
+    }
+    function sqrt5mod8(Fp, n) {
+      const p5div8 = (Fp.ORDER - _5n2) / _8n2;
+      const n2 = Fp.mul(n, _2n6);
+      const v = Fp.pow(n2, p5div8);
+      const nv = Fp.mul(n, v);
+      const i = Fp.mul(Fp.mul(nv, _2n6), v);
+      const root2 = Fp.mul(nv, Fp.sub(i, Fp.ONE));
+      if (!Fp.eql(Fp.sqr(root2), n))
+        throw new Error("Cannot find square root");
+      return root2;
+    }
     function tonelliShanks2(P) {
+      if (P < BigInt(3))
+        throw new Error("sqrt is not defined for small field");
       let Q = P - _1n8;
       let S = 0;
       while (Q % _2n6 === _0n8) {
@@ -243454,70 +243449,49 @@ var require_modular3 = __commonJS({
       }
       let Z = _2n6;
       const _Fp = Field2(P);
-      while (Z < P && FpIsSquare(_Fp, Z)) {
+      while (FpLegendre(_Fp, Z) === 1) {
         if (Z++ > 1e3)
           throw new Error("Cannot find square root: probably non-prime P");
       }
-      if (S === 1) {
-        const p1div4 = (P + _1n8) / _4n3;
-        return function tonelliFast(Fp, n) {
-          const root2 = Fp.pow(n, p1div4);
-          if (!Fp.eql(Fp.sqr(root2), n))
-            throw new Error("Cannot find square root");
-          return root2;
-        };
-      }
+      if (S === 1)
+        return sqrt3mod4;
+      let cc = _Fp.pow(Z, Q);
       const Q1div2 = (Q + _1n8) / _2n6;
       return function tonelliSlow(Fp, n) {
-        if (!FpIsSquare(Fp, n))
+        if (Fp.is0(n))
+          return n;
+        if (FpLegendre(Fp, n) !== 1)
           throw new Error("Cannot find square root");
-        let r = S;
-        let g = Fp.pow(Fp.mul(Fp.ONE, Z), Q);
-        let x = Fp.pow(n, Q1div2);
-        let b = Fp.pow(n, Q);
-        while (!Fp.eql(b, Fp.ONE)) {
-          if (Fp.eql(b, Fp.ZERO))
+        let M = S;
+        let c = Fp.mul(Fp.ONE, cc);
+        let t = Fp.pow(n, Q);
+        let R = Fp.pow(n, Q1div2);
+        while (!Fp.eql(t, Fp.ONE)) {
+          if (Fp.is0(t))
             return Fp.ZERO;
-          let m = 1;
-          for (let t2 = Fp.sqr(b); m < r; m++) {
-            if (Fp.eql(t2, Fp.ONE))
-              break;
-            t2 = Fp.sqr(t2);
+          let i = 1;
+          let t_tmp = Fp.sqr(t);
+          while (!Fp.eql(t_tmp, Fp.ONE)) {
+            i++;
+            t_tmp = Fp.sqr(t_tmp);
+            if (i === M)
+              throw new Error("Cannot find square root");
           }
-          const ge = Fp.pow(g, _1n8 << BigInt(r - m - 1));
-          g = Fp.sqr(ge);
-          x = Fp.mul(x, ge);
-          b = Fp.mul(b, g);
-          r = m;
+          const exponent = _1n8 << BigInt(M - i - 1);
+          const b = Fp.pow(c, exponent);
+          M = i;
+          c = Fp.sqr(b);
+          t = Fp.mul(t, c);
+          R = Fp.mul(R, b);
         }
-        return x;
+        return R;
       };
     }
     function FpSqrt2(P) {
-      if (P % _4n3 === _3n3) {
-        return function sqrt3mod4(Fp, n) {
-          const p1div4 = (P + _1n8) / _4n3;
-          const root2 = Fp.pow(n, p1div4);
-          if (!Fp.eql(Fp.sqr(root2), n))
-            throw new Error("Cannot find square root");
-          return root2;
-        };
-      }
-      if (P % _8n2 === _5n2) {
-        return function sqrt5mod8(Fp, n) {
-          const n2 = Fp.mul(n, _2n6);
-          const c1 = (P - _5n2) / _8n2;
-          const v = Fp.pow(n2, c1);
-          const nv = Fp.mul(n, v);
-          const i = Fp.mul(Fp.mul(nv, _2n6), v);
-          const root2 = Fp.mul(nv, Fp.sub(i, Fp.ONE));
-          if (!Fp.eql(Fp.sqr(root2), n))
-            throw new Error("Cannot find square root");
-          return root2;
-        };
-      }
-      if (P % _16n2 === _9n2) {
-      }
+      if (P % _4n3 === _3n3)
+        return sqrt3mod4;
+      if (P % _8n2 === _5n2)
+        return sqrt5mod8;
       return tonelliShanks2(P);
     }
     var isNegativeLE = (num2, modulo) => (mod2(num2, modulo) & _1n8) === _1n8;
@@ -243592,18 +243566,18 @@ var require_modular3 = __commonJS({
       return Fp.mul(lhs, typeof rhs === "bigint" ? invert2(rhs, Fp.ORDER) : Fp.inv(rhs));
     }
     function FpLegendre(Fp, n) {
-      const legc = (Fp.ORDER - _1n8) / _2n6;
-      const powered = Fp.pow(n, legc);
+      const p1mod2 = (Fp.ORDER - _1n8) / _2n6;
+      const powered = Fp.pow(n, p1mod2);
       const yes = Fp.eql(powered, Fp.ONE);
       const zero = Fp.eql(powered, Fp.ZERO);
       const no = Fp.eql(powered, Fp.neg(Fp.ONE));
       if (!yes && !zero && !no)
-        throw new Error("Cannot find square root: probably non-prime P");
+        throw new Error("invalid Legendre symbol result");
       return yes ? 1 : zero ? 0 : -1;
     }
     function FpIsSquare(Fp, n) {
       const l = FpLegendre(Fp, n);
-      return l === 0 || l === 1;
+      return l === 1;
     }
     function nLength2(n, nBitLength) {
       if (nBitLength !== void 0)
@@ -243902,18 +243876,26 @@ var require_curve4 = __commonJS({
     function pippenger2(c, fieldN, points, scalars) {
       validateMSMPoints2(points, c);
       validateMSMScalars2(scalars, fieldN);
-      if (points.length !== scalars.length)
+      const plength = points.length;
+      const slength = scalars.length;
+      if (plength !== slength)
         throw new Error("arrays of points and scalars must have equal length");
       const zero = c.ZERO;
-      const wbits = (0, utils_ts_1.bitLen)(BigInt(points.length));
-      const windowSize = wbits > 12 ? wbits - 3 : wbits > 4 ? wbits - 2 : wbits ? 2 : 1;
+      const wbits = (0, utils_ts_1.bitLen)(BigInt(plength));
+      let windowSize = 1;
+      if (wbits > 12)
+        windowSize = wbits - 3;
+      else if (wbits > 4)
+        windowSize = wbits - 2;
+      else if (wbits > 0)
+        windowSize = 2;
       const MASK = (0, utils_ts_1.bitMask)(windowSize);
       const buckets = new Array(Number(MASK) + 1).fill(zero);
       const lastBits = Math.floor((fieldN.BITS - 1) / windowSize) * windowSize;
       let sum = zero;
       for (let i = lastBits; i >= 0; i -= windowSize) {
         buckets.fill(zero);
-        for (let j = 0; j < scalars.length; j++) {
+        for (let j = 0; j < slength; j++) {
           const scalar = scalars[j];
           const wbits2 = Number(scalar >> BigInt(i) & MASK);
           buckets[wbits2] = buckets[wbits2].add(points[j]);
@@ -244011,21 +243993,21 @@ var require_weierstrass3 = __commonJS({
         a: "field",
         b: "field"
       }, {
+        allowInfinityPoint: "boolean",
         allowedPrivateKeyLengths: "array",
-        wrapPrivateKey: "boolean",
-        isTorsionFree: "function",
         clearCofactor: "function",
-        allowInfinityPoint: "boolean",
         fromBytes: "function",
-        toBytes: "function"
+        isTorsionFree: "function",
+        toBytes: "function",
+        wrapPrivateKey: "boolean"
       });
       const { endo, Fp, a } = opts;
       if (endo) {
         if (!Fp.eql(a, Fp.ZERO)) {
-          throw new Error("invalid endomorphism, can only be defined for Koblitz curves that have a=0");
+          throw new Error("invalid endo: CURVE.a must be 0");
         }
         if (typeof endo !== "object" || typeof endo.beta !== "bigint" || typeof endo.splitScalar !== "function") {
-          throw new Error("invalid endomorphism, expected beta: bigint and splitScalar: function");
+          throw new Error('invalid endo: expected "beta": bigint and "splitScalar": function');
         }
       }
       return Object.freeze({ ...opts });
@@ -244136,6 +244118,9 @@ var require_weierstrass3 = __commonJS({
         return tlv.encode(48, seq);
       }
     };
+    function numToSizedHex(num2, size5) {
+      return (0, utils_ts_1.bytesToHex)((0, utils_ts_1.numberToBytesBE)(num2, size5));
+    }
     var _0n8 = BigInt(0);
     var _1n8 = BigInt(1);
     var _2n6 = BigInt(2);
@@ -244161,8 +244146,17 @@ var require_weierstrass3 = __commonJS({
         const x3 = Fp.mul(x2, x);
         return Fp.add(Fp.add(x3, Fp.mul(x, a)), b);
       }
-      if (!Fp.eql(Fp.sqr(CURVE.Gy), weierstrassEquation(CURVE.Gx)))
-        throw new Error("bad generator point: equation left != right");
+      function isValidXY(x, y) {
+        const left = Fp.sqr(y);
+        const right = weierstrassEquation(x);
+        return Fp.eql(left, right);
+      }
+      if (!isValidXY(CURVE.Gx, CURVE.Gy))
+        throw new Error("bad curve params: generator point");
+      const _4a3 = Fp.mul(Fp.pow(CURVE.a, _3n3), _4n3);
+      const _27b2 = Fp.mul(Fp.sqr(CURVE.b), BigInt(27));
+      if (Fp.is0(Fp.add(_4a3, _27b2)))
+        throw new Error("bad curve params: a or b");
       function isWithinCurveOrder(num2) {
         return (0, utils_ts_1.inRange)(num2, _1n8, CURVE.n);
       }
@@ -244215,9 +244209,7 @@ var require_weierstrass3 = __commonJS({
         const { x, y } = p.toAffine();
         if (!Fp.isValid(x) || !Fp.isValid(y))
           throw new Error("bad point: x or y not FE");
-        const left = Fp.sqr(y);
-        const right = weierstrassEquation(x);
-        if (!Fp.eql(left, right))
+        if (!isValidXY(x, y))
           throw new Error("bad point: equation left != right");
         if (!p.isTorsionFree())
           throw new Error("bad point: not in prime-order subgroup");
@@ -244423,16 +244415,16 @@ var require_weierstrass3 = __commonJS({
          * an exposed private key e.g. sig verification, which works over *public* keys.
          */
         multiplyUnsafe(sc) {
-          const { endo, n: N } = CURVE;
+          const { endo: endo2, n: N } = CURVE;
           (0, utils_ts_1.aInRange)("scalar", sc, _0n8, N);
           const I = Point2.ZERO;
           if (sc === _0n8)
             return I;
           if (this.is0() || sc === _1n8)
             return this;
-          if (!endo || wnaf.hasPrecomputes(this))
+          if (!endo2 || wnaf.hasPrecomputes(this))
             return wnaf.wNAFCachedUnsafe(this, sc, Point2.normalizeZ);
-          let { k1neg, k1, k2neg, k2 } = endo.splitScalar(sc);
+          let { k1neg, k1, k2neg, k2 } = endo2.splitScalar(sc);
           let k1p = I;
           let k2p = I;
           let d = this;
@@ -244449,7 +244441,7 @@ var require_weierstrass3 = __commonJS({
             k1p = k1p.negate();
           if (k2neg)
             k2p = k2p.negate();
-          k2p = new Point2(Fp.mul(k2p.px, endo.beta), k2p.py, k2p.pz);
+          k2p = new Point2(Fp.mul(k2p.px, endo2.beta), k2p.py, k2p.pz);
           return k1p.add(k2p);
         }
         /**
@@ -244462,16 +244454,16 @@ var require_weierstrass3 = __commonJS({
          * @returns New point
          */
         multiply(scalar) {
-          const { endo, n: N } = CURVE;
+          const { endo: endo2, n: N } = CURVE;
           (0, utils_ts_1.aInRange)("scalar", scalar, _1n8, N);
           let point, fake;
-          if (endo) {
-            const { k1neg, k1, k2neg, k2 } = endo.splitScalar(scalar);
+          if (endo2) {
+            const { k1neg, k1, k2neg, k2 } = endo2.splitScalar(scalar);
             let { p: k1p, f: f1p } = this.wNAF(k1);
             let { p: k2p, f: f2p } = this.wNAF(k2);
             k1p = wnaf.constTimeNegate(k1neg, k1p);
             k2p = wnaf.constTimeNegate(k2neg, k2p);
-            k2p = new Point2(Fp.mul(k2p.px, endo.beta), k2p.py, k2p.pz);
+            k2p = new Point2(Fp.mul(k2p.px, endo2.beta), k2p.py, k2p.pz);
             point = k1p.add(k2p);
             fake = f1p.add(f2p);
           } else {
@@ -244527,8 +244519,8 @@ var require_weierstrass3 = __commonJS({
       }
       Point2.BASE = new Point2(CURVE.Gx, CURVE.Gy, Fp.ONE);
       Point2.ZERO = new Point2(Fp.ZERO, Fp.ONE, Fp.ZERO);
-      const _bits = CURVE.nBitLength;
-      const wnaf = (0, curve_ts_1.wNAF)(Point2, CURVE.endo ? Math.ceil(_bits / 2) : _bits);
+      const { endo, nBitLength } = CURVE;
+      const wnaf = (0, curve_ts_1.wNAF)(Point2, endo ? Math.ceil(nBitLength / 2) : nBitLength);
       return {
         CURVE,
         ProjectivePoint: Point2,
@@ -244552,7 +244544,7 @@ var require_weierstrass3 = __commonJS({
     }
     function weierstrass2(curveDef) {
       const CURVE = validateOpts2(curveDef);
-      const { Fp, n: CURVE_ORDER } = CURVE;
+      const { Fp, n: CURVE_ORDER, nByteLength, nBitLength } = CURVE;
       const compressedLen = Fp.BYTES + 1;
       const uncompressedLen = 2 * Fp.BYTES + 1;
       function modN2(a) {
@@ -244606,7 +244598,6 @@ var require_weierstrass3 = __commonJS({
           }
         }
       });
-      const numToNByteHex = (num2) => (0, utils_ts_1.bytesToHex)((0, utils_ts_1.numberToBytesBE)(num2, CURVE.nByteLength));
       function isBiggerThanHalfOrder(number) {
         const HALF = CURVE_ORDER >> _1n8;
         return number > HALF;
@@ -244627,7 +244618,7 @@ var require_weierstrass3 = __commonJS({
         }
         // pair (bytes of r, bytes of s)
         static fromCompact(hex) {
-          const l = CURVE.nByteLength;
+          const l = nByteLength;
           hex = (0, utils_ts_1.ensureBytes)("compactSignature", hex, l * 2);
           return new Signature(slcNum(hex, 0, l), slcNum(hex, l, 2 * l));
         }
@@ -244655,7 +244646,7 @@ var require_weierstrass3 = __commonJS({
           if (radj >= Fp.ORDER)
             throw new Error("recovery id 2 or 3 invalid");
           const prefix = (rec & 1) === 0 ? "02" : "03";
-          const R = Point2.fromHex(prefix + numToNByteHex(radj));
+          const R = Point2.fromHex(prefix + numToSizedHex(radj, Fp.BYTES));
           const ir = invN(radj);
           const u1 = modN2(-h * ir);
           const u2 = modN2(s * ir);
@@ -244684,7 +244675,8 @@ var require_weierstrass3 = __commonJS({
           return (0, utils_ts_1.hexToBytes)(this.toCompactHex());
         }
         toCompactHex() {
-          return numToNByteHex(this.r) + numToNByteHex(this.s);
+          const l = nByteLength;
+          return numToSizedHex(this.r, l) + numToSizedHex(this.s, l);
         }
       }
       const utils = {
@@ -244723,21 +244715,25 @@ var require_weierstrass3 = __commonJS({
         return Point2.fromPrivateKey(privateKey).toRawBytes(isCompressed);
       }
       function isProbPub(item) {
-        const arr = (0, utils_ts_1.isBytes)(item);
-        const str = typeof item === "string";
-        const len = (arr || str) && item.length;
-        if (arr)
-          return len === compressedLen || len === uncompressedLen;
-        if (str)
-          return len === 2 * compressedLen || len === 2 * uncompressedLen;
+        if (typeof item === "bigint")
+          return false;
         if (item instanceof Point2)
           return true;
-        return false;
+        const arr = (0, utils_ts_1.ensureBytes)("key", item);
+        const len = arr.length;
+        const fpl = Fp.BYTES;
+        const compLen = fpl + 1;
+        const uncompLen = 2 * fpl + 1;
+        if (CURVE.allowedPrivateKeyLengths || nByteLength === compLen) {
+          return void 0;
+        } else {
+          return len === compLen || len === uncompLen;
+        }
       }
       function getSharedSecret(privateA, publicB, isCompressed = true) {
-        if (isProbPub(privateA))
+        if (isProbPub(privateA) === true)
           throw new Error("first arg must be private key");
-        if (!isProbPub(publicB))
+        if (isProbPub(publicB) === false)
           throw new Error("second arg must be public key");
         const b = Point2.fromHex(publicB);
         return b.multiply(normPrivateKeyToScalar(privateA)).toRawBytes(isCompressed);
@@ -244746,16 +244742,16 @@ var require_weierstrass3 = __commonJS({
         if (bytes.length > 8192)
           throw new Error("input is too large");
         const num2 = (0, utils_ts_1.bytesToNumberBE)(bytes);
-        const delta = bytes.length * 8 - CURVE.nBitLength;
+        const delta = bytes.length * 8 - nBitLength;
         return delta > 0 ? num2 >> BigInt(delta) : num2;
       };
       const bits2int_modN = CURVE.bits2int_modN || function(bytes) {
         return modN2(bits2int(bytes));
       };
-      const ORDER_MASK = (0, utils_ts_1.bitMask)(CURVE.nBitLength);
+      const ORDER_MASK = (0, utils_ts_1.bitMask)(nBitLength);
       function int2octets(num2) {
-        (0, utils_ts_1.aInRange)("num < 2^" + CURVE.nBitLength, num2, _0n8, ORDER_MASK);
-        return (0, utils_ts_1.numberToBytesBE)(num2, CURVE.nByteLength);
+        (0, utils_ts_1.aInRange)("num < 2^" + nBitLength, num2, _0n8, ORDER_MASK);
+        return (0, utils_ts_1.numberToBytesBE)(num2, nByteLength);
       }
       function prepSig(msgHash, privateKey, opts = defaultSigOpts) {
         if (["recovered", "canonical"].some((k) => k in opts))
@@ -362126,14 +362122,14 @@ init_stringify();
 // ../../node_modules/viem/_esm/utils/promise/withCache.js
 var promiseCache = /* @__PURE__ */ new Map();
 var responseCache = /* @__PURE__ */ new Map();
-function getCache(cacheKey3) {
-  const buildCache = (cacheKey4, cache) => ({
-    clear: () => cache.delete(cacheKey4),
-    get: () => cache.get(cacheKey4),
-    set: (data) => cache.set(cacheKey4, data)
+function getCache(cacheKey2) {
+  const buildCache = (cacheKey3, cache) => ({
+    clear: () => cache.delete(cacheKey3),
+    get: () => cache.get(cacheKey3),
+    set: (data) => cache.set(cacheKey3, data)
   });
-  const promise = buildCache(cacheKey3, promiseCache);
-  const response = buildCache(cacheKey3, responseCache);
+  const promise = buildCache(cacheKey2, promiseCache);
+  const response = buildCache(cacheKey2, responseCache);
   return {
     clear: () => {
       promise.clear();
@@ -362143,8 +362139,8 @@ function getCache(cacheKey3) {
     response
   };
 }
-async function withCache(fn, { cacheKey: cacheKey3, cacheTime = Number.POSITIVE_INFINITY }) {
-  const cache = getCache(cacheKey3);
+async function withCache(fn, { cacheKey: cacheKey2, cacheTime = Number.POSITIVE_INFINITY }) {
+  const cache = getCache(cacheKey2);
   const response = cache.response.get();
   if (response && cacheTime > 0) {
     const age = (/* @__PURE__ */ new Date()).getTime() - response.created.getTime();
@@ -365201,7 +365197,7 @@ init_decodeFunctionResult();
 init_encodeFunctionData();
 init_getChainContractAddress();
 async function multicall(client, parameters) {
-  const { allowFailure = true, batchSize: batchSize_, blockNumber, blockTag, multicallAddress: multicallAddress_, stateOverride } = parameters;
+  const { account, allowFailure = true, batchSize: batchSize_, blockNumber, blockTag, multicallAddress: multicallAddress_, stateOverride } = parameters;
   const contracts2 = parameters.contracts;
   const batchSize = batchSize_ ?? (typeof client.batch?.multicall === "object" && client.batch.multicall.batchSize || 1024);
   let multicallAddress = multicallAddress_;
@@ -365246,7 +365242,8 @@ async function multicall(client, parameters) {
         address,
         args,
         docsPath: "/docs/contract/multicall",
-        functionName
+        functionName,
+        sender: account
       });
       if (!allowFailure)
         throw error;
@@ -365262,6 +365259,7 @@ async function multicall(client, parameters) {
   }
   const aggregate3Results = await Promise.allSettled(chunkedCalls.map((calls) => getAction(client, readContract, "readContract")({
     abi: multicall3Abi,
+    account,
     address: multicallAddress,
     args: [calls],
     blockNumber,
@@ -368103,7 +368101,7 @@ init_parseAccount();
 init_encodeFunctionData();
 init_toHex();
 async function sendCalls(client, parameters) {
-  const { account: account_ = client.account, chain = client.chain, forceAtomic = false, id, version: version4 = "2.0.0" } = parameters;
+  const { account: account_ = client.account, capabilities, chain = client.chain, forceAtomic = false, id, version: version4 = "2.0.0" } = parameters;
   if (typeof account_ === "undefined")
     throw new AccountNotFoundError({
       docsPath: "/docs/actions/wallet/sendCalls"
@@ -368129,7 +368127,7 @@ async function sendCalls(client, parameters) {
         {
           atomicRequired: forceAtomic,
           calls,
-          capabilities: formatRequestCapabilities(parameters.capabilities),
+          capabilities,
           chainId: numberToHex(chain.id),
           from: account?.address,
           id,
@@ -368148,18 +368146,6 @@ async function sendCalls(client, parameters) {
     });
   }
 }
-function formatRequestCapabilities(capabilities) {
-  const paymasterService = capabilities?.paymasterService ? Object.entries(capabilities.paymasterService).reduce((paymasterService2, [chainId, value]) => ({
-    ...paymasterService2 ?? {},
-    [numberToHex(Number(chainId))]: value
-  }), {}) : void 0;
-  return {
-    ...capabilities,
-    ...paymasterService ? {
-      paymasterService
-    } : {}
-  };
-}
 
 // ../../node_modules/viem/_esm/actions/wallet/showCallsStatus.js
 async function showCallsStatus(client, parameters) {
@@ -409255,6 +409241,44 @@ function isRedstone(pf) {
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/pricefeeds/RedstoneUpdater.js
 var import_evm_connector = __toESM(require_src5(), 1);
 var import_protocol = __toESM(require_src2(), 1);
+
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/pricefeeds/RedstoneCache.js
+var RedstoneCache = class {
+  #cache = /* @__PURE__ */ new Map();
+  #ttlMs;
+  #historical;
+  constructor(opts) {
+    this.#ttlMs = opts.ttl;
+    this.#historical = opts.historical;
+  }
+  get(dataServiceId, dataFeedId, uniqueSignersCount) {
+    const key = this.#cacheKey(dataServiceId, dataFeedId, uniqueSignersCount);
+    const data = this.#cache.get(key);
+    if (!data) {
+      return void 0;
+    }
+    if (this.#expired(data)) {
+      this.#cache.delete(key);
+      return void 0;
+    }
+    return data;
+  }
+  set(dataServiceId, dataFeedId, uniqueSignersCount, value) {
+    const key = this.#cacheKey(dataServiceId, dataFeedId, uniqueSignersCount);
+    this.#cache.set(key, value);
+  }
+  #expired(value) {
+    if (this.#historical) {
+      return false;
+    }
+    return value.timestamp * 1e3 + this.#ttlMs < Date.now();
+  }
+  #cacheKey(dataServiceId, dataFeedId, uniqueSignersCount) {
+    return `${dataServiceId}:${dataFeedId}:${uniqueSignersCount}`;
+  }
+};
+
+// ../../node_modules/@gearbox-protocol/sdk/dist/esm/sdk/market/pricefeeds/RedstoneUpdater.js
 var MAX_DATA_TIMESTAMP_DELAY_SECONDS = 10n * 60n;
 var MAX_DATA_TIMESTAMP_AHEAD_SECONDS = 60n;
 var RedstoneUpdateTx = class {
@@ -409282,24 +409306,29 @@ var RedstoneUpdateTx = class {
 };
 var RedstoneUpdater = class extends SDKConstruct {
   #logger;
-  #cache = /* @__PURE__ */ new Map();
+  #cache;
   #historicalTimestampMs;
   #gateways;
-  constructor(sdk) {
+  #ignoreMissingFeeds;
+  #enableLogging;
+  constructor(sdk, opts = {}) {
     super(sdk);
     this.#logger = childLogger("RedstoneUpdater", sdk.logger);
-  }
-  /**
-   * Set redstone historical timestamp in milliseconds
-   */
-  set historicalTimestamp(timestampMs) {
-    this.#historicalTimestampMs = 6e4 * Math.floor(timestampMs / 6e4);
-  }
-  /**
-   * Set redstone gateways
-   */
-  set gateways(gateways) {
-    this.#gateways = gateways;
+    this.#ignoreMissingFeeds = opts.ignoreMissingFeeds;
+    this.#enableLogging = opts.enableLogging;
+    this.#gateways = opts.gateways?.length ? opts.gateways : void 0;
+    let ts = opts.historicTimestamp;
+    if (ts) {
+      ts = ts === true ? Number(this.sdk.timestamp) * 1e3 : ts;
+      this.#historicalTimestampMs = 6e4 * Math.floor(ts / 6e4);
+    }
+    this.#cache = new RedstoneCache({
+      // currently staleness period is 240 seconds on all networks, add some buffer
+      // this period of 4 minutes is selected based on time that is required for user to sign transaction with wallet
+      // so it's unlikely to decrease
+      ttl: opts.cacheTTL ?? 225 * 1e3,
+      historical: !!ts
+    });
   }
   async getUpdateTxs(feeds, logContext = {}) {
     this.#logger?.debug(
@@ -409373,14 +409402,12 @@ var RedstoneUpdater = class extends SDKConstruct {
     const fromCache = [];
     const uncached = [];
     for (const dataFeedId of dataFeedsIds) {
-      const key = cacheKey2(
+      const cached = this.#cache.get(
         dataServiceId,
         dataFeedId,
-        uniqueSignersCount,
-        this.#historicalTimestampMs
+        uniqueSignersCount
       );
-      const cached = this.#cache.get(key);
-      if (this.#historicalTimestampMs && !!cached) {
+      if (cached) {
         fromCache.push({ ...cached, cached: true });
       } else {
         uncached.push(dataFeedId);
@@ -409391,16 +409418,8 @@ var RedstoneUpdater = class extends SDKConstruct {
       new Set(uncached),
       uniqueSignersCount
     );
-    if (this.#historicalTimestampMs) {
-      for (const resp of fromRedstone) {
-        const key = cacheKey2(
-          dataServiceId,
-          resp.dataFeedId,
-          uniqueSignersCount,
-          this.#historicalTimestampMs
-        );
-        this.#cache.set(key, resp);
-      }
+    for (const resp of fromRedstone) {
+      this.#cache.set(dataServiceId, resp.dataFeedId, uniqueSignersCount, resp);
     }
     this.#logger?.debug(
       `got ${fromRedstone.length} new redstone updates and ${fromCache.length} from cache`
@@ -409429,7 +409448,9 @@ var RedstoneUpdater = class extends SDKConstruct {
       dataPackagesIds,
       uniqueSignersCount,
       historicalTimestamp: this.#historicalTimestampMs,
-      urls: this.#gateways
+      urls: this.#gateways,
+      ignoreMissingFeed: this.#ignoreMissingFeeds,
+      enableEnhancedLogs: this.#enableLogging
     });
     const dataPayload = await retry(
       () => wrapper.prepareRedstonePayload(true),
@@ -409455,9 +409476,6 @@ var RedstoneUpdater = class extends SDKConstruct {
     });
   }
 };
-function cacheKey2(dataServiceId, dataFeedId, uniqueSignersCount, historicalTimestamp = 0) {
-  return `${dataServiceId}:${dataFeedId}:${uniqueSignersCount}:${historicalTimestamp}`;
-}
 function groupDataPackages(signedDataPackages) {
   const packagesByDataFeedId = {};
   for (const p of signedDataPackages) {
@@ -409558,10 +409576,10 @@ var PriceFeedRegister = class extends SDKConstruct {
   #feeds = new AddressMap(void 0, "priceFeeds");
   #latestUpdate;
   redstoneUpdater;
-  constructor(sdk) {
+  constructor(sdk, opts = {}) {
     super(sdk);
     this.logger = childLogger("PriceFeedRegister", sdk.logger);
-    this.redstoneUpdater = new RedstoneUpdater(sdk);
+    this.redstoneUpdater = new RedstoneUpdater(sdk, opts?.redstone);
   }
   addHook = this.#hooks.addHook.bind(this.#hooks);
   removeHook = this.#hooks.removeHook.bind(this.#hooks);
@@ -409634,12 +409652,11 @@ var PriceFeedRegister = class extends SDKConstruct {
    * Loads PARTIAL information about all updatable price feeds from MarketCompressor
    * This is not saved anywhere in PriceFeedRegister, and can later be used to load price feed updates
    */
-  async getPartialUpdatablePriceFeeds(marketConfigurators, pools) {
+  async getPartialUpdatablePriceFeeds(configurators, pools) {
     const [priceFeedCompressorAddress] = this.sdk.addressProvider.mustGetLatest(
       AP_PRICE_FEED_COMPRESSOR,
       VERSION_RANGE_310
     );
-    const configurators = marketConfigurators ?? this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
     this.logger?.debug(
       { configurators, pools },
       `calling getUpdatablePriceFeeds in block ${this.sdk.currentBlock}`
@@ -409999,9 +410016,7 @@ var PriceOracleBaseContract = class extends BaseContract {
       }
       this.#labelPriceFeed(priceFeed, reserve ? "Reserve" : "Main", token);
     }
-    this.logger?.debug(
-      `Got ${this.mainPriceFeeds.size} main and ${this.reservePriceFeeds.size} reserve price feeds`
-    );
+    this.dirty = false;
   }
   #labelPriceFeed(address, usage, token) {
     this.sdk.provider.addressLabels.set(address, (oldLabel) => {
@@ -410781,6 +410796,7 @@ var PoolSuite = class extends SDKConstruct {
   pqk;
   rateKeeper;
   interestRateModel;
+  #marketConfigurator;
   constructor(sdk, data) {
     super(sdk);
     this.pool = createPool(sdk, data.pool);
@@ -410790,6 +410806,7 @@ var PoolSuite = class extends SDKConstruct {
       sdk,
       data.interestRateModel
     );
+    this.#marketConfigurator = data.configurator;
   }
   get gauge() {
     if (this.rateKeeper instanceof GaugeContract) {
@@ -410815,6 +410832,11 @@ var PoolSuite = class extends SDKConstruct {
       `Interest rate model is not a linear model, but a ${this.interestRateModel.contractType}`
     );
   }
+  get marketConfigurator() {
+    return this.sdk.contracts.mustGet(
+      this.#marketConfigurator
+    );
+  }
   get underlying() {
     return this.pool.underlying;
   }
@@ -410873,6 +410895,9 @@ var MarketSuite = class extends SDKConstruct {
       this.creditManagers.push(new CreditSuite(sdk, marketData, i));
     }
     this.priceOracle = getOrCreatePriceOracle(sdk, marketData.priceOracle);
+    sdk.logger?.debug(
+      `oracle ${this.labelAddress(this.priceOracle.address)} has ${this.priceOracle.mainPriceFeeds.size} main and ${this.priceOracle.reservePriceFeeds.size} reserve price feeds`
+    );
   }
   get dirty() {
     return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);
@@ -410941,14 +410966,17 @@ var MarketRegister = class extends SDKConstruct {
     const nonDirtyOracles = [];
     for (const m of this.markets) {
       if (m.dirty) {
-        dirtyPools.push(m.pool.pool.address);
+        dirtyPools.push(m.pool);
       } else {
         nonDirtyOracles.push(m.priceOracle.address);
       }
     }
     if (dirtyPools.length) {
       this.#logger?.debug(`need to reload ${dirtyPools.length} markets`);
-      await this.#loadMarkets([], dirtyPools);
+      await this.#loadMarkets(
+        Array.from(new Set(dirtyPools.map((p) => p.marketConfigurator.address))),
+        dirtyPools.map((p) => p.pool.address)
+      );
     } else if (!skipPriceUpdate && nonDirtyOracles.length) {
       this.#logger?.debug(
         `syncing prices on ${nonDirtyOracles.length} oracles`
@@ -411236,16 +411264,13 @@ var GearboxSDK = class _GearboxSDK {
   #attachConfig;
   // Collection of markets
   #marketRegister;
+  #priceFeeds;
   logger;
   /**
    * Interest rate models can be reused across chain (and SDK operates on chain level)
    * TODO: use whatever interface is necessary for InterestRateModels
    */
   interestRateModels = new AddressMap();
-  /**
-   * All price feeds known to sdk, without oracle-related data (stalenessPeriod, main/reserve, etc.)
-   */
-  priceFeeds;
   /**
    * Will throw an error if contract type is not supported, otherwise will try to use generic contract first, if possible
    */
@@ -411268,9 +411293,10 @@ var GearboxSDK = class _GearboxSDK {
       logger: logger2,
       plugins,
       blockNumber,
-      redstoneHistoricTimestamp,
+      redstone,
       ignoreUpdateablePrices,
-      marketConfigurators: mcs
+      marketConfigurators: mcs,
+      strictContractTypes
     } = options;
     let { networkType, addressProvider, chainId } = options;
     const attachClient = createPublicClient({
@@ -411294,28 +411320,33 @@ var GearboxSDK = class _GearboxSDK {
     return new _GearboxSDK({
       provider,
       logger: logger2,
-      plugins
+      plugins,
+      strictContractTypes
     }).#attach({
       addressProvider,
       blockNumber,
-      redstoneHistoricTimestamp,
       ignoreUpdateablePrices,
-      marketConfigurators
+      marketConfigurators,
+      redstone
     });
   }
   static hydrate(options, state) {
-    const { logger: logger2, plugins, ...rest } = options;
+    const { logger: logger2, plugins, strictContractTypes, ...rest } = options;
     const provider = new Provider({
       ...rest,
       chainId: state.chainId,
       networkType: state.network
     });
-    return new _GearboxSDK({ provider, plugins, logger: logger2 }).#hydrate(rest, state);
+    return new _GearboxSDK({
+      provider,
+      plugins,
+      logger: logger2,
+      strictContractTypes
+    }).#hydrate(rest, state);
   }
   constructor(options) {
     this.#provider = options.provider;
     this.logger = options.logger;
-    this.priceFeeds = new PriceFeedRegister(this);
     this.strictContractTypes = options.strictContractTypes ?? false;
     const pluginsInstances = {};
     for (const [name, Plugin] of TypedObjectUtils.entries(
@@ -411329,9 +411360,9 @@ var GearboxSDK = class _GearboxSDK {
     const {
       addressProvider,
       blockNumber,
-      redstoneHistoricTimestamp,
       ignoreUpdateablePrices,
-      marketConfigurators
+      marketConfigurators,
+      redstone
     } = opts;
     const re = this.#attachConfig ? "re" : "";
     this.logger?.info(
@@ -411343,7 +411374,7 @@ var GearboxSDK = class _GearboxSDK {
       },
       `${re}attaching gearbox sdk`
     );
-    if (!!blockNumber && !redstoneHistoricTimestamp) {
+    if (!!blockNumber && !opts.redstone?.historicTimestamp) {
       this.logger?.warn(
         `${re}attaching to fixed block number, but redstoneHistoricTimestamp is not set. price updates might fail`
       );
@@ -411357,7 +411388,7 @@ var GearboxSDK = class _GearboxSDK {
     );
     this.#currentBlock = block.number;
     this.#timestamp = block.timestamp;
-    this.#confugureRedstone(opts);
+    this.#priceFeeds = new PriceFeedRegister(this, { redstone });
     this.logger?.debug(
       `${re}attach block number ${this.currentBlock} timestamp ${this.timestamp}`
     );
@@ -411393,7 +411424,7 @@ var GearboxSDK = class _GearboxSDK {
     return this;
   }
   #hydrate(options, state) {
-    const { logger: _logger, ...opts } = options;
+    const { logger: _logger, redstone, ...opts } = options;
     if (state.version !== STATE_VERSION) {
       throw new Error(
         `hydrated state version is ${state.version}, but expected ${STATE_VERSION}`
@@ -411401,7 +411432,7 @@ var GearboxSDK = class _GearboxSDK {
     }
     this.#currentBlock = state.currentBlock;
     this.#timestamp = state.timestamp;
-    this.#confugureRedstone(opts);
+    this.#priceFeeds = new PriceFeedRegister(this, { redstone });
     this.#addressProvider = hydrateAddressProvider(this, state.addressProvider);
     this.logger?.debug(
       `address provider version: ${this.#addressProvider.version}`
@@ -411427,15 +411458,6 @@ var GearboxSDK = class _GearboxSDK {
     }
     return this;
   }
-  #confugureRedstone(opts) {
-    const { redstoneGateways, redstoneHistoricTimestamp } = opts;
-    if (redstoneHistoricTimestamp) {
-      this.priceFeeds.redstoneUpdater.historicalTimestamp = redstoneHistoricTimestamp === true ? Number(this.timestamp) * 1e3 : redstoneHistoricTimestamp;
-    }
-    if (redstoneGateways?.length) {
-      this.priceFeeds.redstoneUpdater.gateways = redstoneGateways;
-    }
-  }
   /**
    * Reattach SDK with the same config as before, without re-creating instance. Will load all state from scratch
    * Be mindful of block number, for example
@@ -411537,7 +411559,7 @@ var GearboxSDK = class _GearboxSDK {
    */
   async syncState(opts) {
     let { blockNumber, timestamp, skipPriceUpdate } = opts ?? {};
-    if (this.#attachConfig?.redstoneHistoricTimestamp) {
+    if (this.#attachConfig?.redstone?.historicTimestamp) {
       throw new Error(
         "syncState is not supported with redstoneHistoricTimestamp"
       );
@@ -411562,11 +411584,12 @@ var GearboxSDK = class _GearboxSDK {
       ...Array.from(this.marketRegister.watchAddresses),
       this.addressProvider.address
     ];
+    const fromBlock = this.currentBlock + 1n;
     this.logger?.debug(
-      `getting logs from ${watchAddresses.length} addresses in [${this.currentBlock}:${blockNumber}]`
+      `getting logs from ${watchAddresses.length} addresses in [${fromBlock}:${blockNumber}]`
     );
     const logs = await getLogsSafe(this.provider.publicClient, {
-      fromBlock: this.currentBlock,
+      fromBlock,
       toBlock: blockNumber,
       address: watchAddresses
     });
@@ -411620,6 +411643,15 @@ var GearboxSDK = class _GearboxSDK {
     }
     return this.#timestamp;
   }
+  /**
+   * All price feeds known to sdk, without oracle-related data (stalenessPeriod, main/reserve, etc.)
+   */
+  get priceFeeds() {
+    if (this.#priceFeeds === void 0) {
+      throw ERR_NOT_ATTACHED;
+    }
+    return this.#priceFeeds;
+  }
   get gear() {
     try {
       const g = this.addressProvider.getAddress(AP_GEAR_TOKEN, NO_VERSION);
@@ -439829,7 +439861,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.30.0",
+  version: "5.30.1",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -439872,10 +439904,10 @@ var package_default = {
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "6.0.0",
+    "@gearbox-protocol/sdk": "7.0.0",
     "@gearbox-protocol/sdk-gov": "^2.37.0",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.15.12",
+    "@types/node": "^22.15.18",
     "@types/react": "^19.1.4",
     "@types/react-dom": "^19.1.5",
     abitype: "^1.0.8",
@@ -439894,8 +439926,8 @@ var package_default = {
     "react-dom": "^19.1.0",
     table: "^6.9.0",
     tsx: "^4.19.4",
-    viem: "^2.29.2",
-    yaml: "^2.7.1",
+    viem: "^2.29.3",
+    yaml: "^2.8.0",
     zod: "^3.24.4"
   },
   prettier: "@gearbox-protocol/prettier-config",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.30.0",
+  "version": "5.30.1",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -44,10 +44,10 @@
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "6.0.0",
+    "@gearbox-protocol/sdk": "7.0.0",
     "@gearbox-protocol/sdk-gov": "^2.37.0",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.15.12",
+    "@types/node": "^22.15.18",
     "@types/react": "^19.1.4",
     "@types/react-dom": "^19.1.5",
     "abitype": "^1.0.8",
@@ -66,8 +66,8 @@
     "react-dom": "^19.1.0",
     "table": "^6.9.0",
     "tsx": "^4.19.4",
-    "viem": "^2.29.2",
-    "yaml": "^2.7.1",
+    "viem": "^2.29.3",
+    "yaml": "^2.8.0",
     "zod": "^3.24.4"
   },
   "prettier": "@gearbox-protocol/prettier-config",