@imtbl/sdk 0.35.1 → 0.35.2

package/dist/index.cjs

@@ -3791,7 +3791,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.35.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.35.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -3851,7 +3851,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.35.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.35.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4262,7 +4262,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.35.1',
+    sdkVersion: 'ts-immutable-sdk-0.35.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -8790,7 +8790,7 @@ var ChainId$1;
 (function (ChainId) {
     ChainId[ChainId["IMTBL_ZKEVM_MAINNET"] = 13371] = "IMTBL_ZKEVM_MAINNET";
     ChainId[ChainId["IMTBL_ZKEVM_TESTNET"] = 13473] = "IMTBL_ZKEVM_TESTNET";
-    ChainId[ChainId["IMTBL_ZKEVM_DEVNET"] = 13433] = "IMTBL_ZKEVM_DEVNET";
+    ChainId[ChainId["IMTBL_ZKEVM_DEVNET"] = 15003] = "IMTBL_ZKEVM_DEVNET";
     ChainId[ChainId["ETHEREUM"] = 1] = "ETHEREUM";
     ChainId[ChainId["SEPOLIA"] = 11155111] = "SEPOLIA";
 })(ChainId$1 || (ChainId$1 = {}));
@@ -28900,36 +28900,38 @@ startTokenIn = tokenIn) => {
     return routes;
 };
 
-/**
- * Determines whether or not the chain supports EIP-1559 by checking for the existence
- * of {@link FeeData.maxFeePerGas} and {@link FeeData.maxPriorityFeePerGas}
- *
- * @param {FeeData} fee - The fee data for the chain
- */
-const doesChainSupportEIP1559$1 = (fee) => {
-    const supportsEIP1559 = !!fee.maxFeePerGas && !!fee.maxPriorityFeePerGas;
-    return supportsEIP1559;
+const getFeeData = async (provider) => {
+    const [block, maxPriorityFeePerGas] = await Promise.all([
+        provider.getBlock('latest'),
+        provider.send('eth_maxPriorityFeePerGas', []),
+    ]);
+    if (!block.baseFeePerGas)
+        throw new Error('Base fee per gas not found in block');
+    return {
+        // https://www.blocknative.com/blog/eip-1559-fees
+        maxFeePerGas: block.baseFeePerGas.mul(2).add(maxPriorityFeePerGas),
+        maxPriorityFeePerGas,
+        lastBaseFeePerGas: block.baseFeePerGas,
+    };
 };
 /**
  * Fetch the current gas price estimate. Supports both EIP-1559 and non-EIP1559 chains
- * @param {JsonRpcProvider} provider - The JSON RPC provider used to fetch fee data
+ * @param {Provider} provider - The JSON RPC provider used to fetch fee data
  * @param {Native} nativeToken - The native token of the chain. Gas prices will be denominated in this token
- * @returns {Amount | null} - The gas price in the smallest denomination of the chain's currency,
+ * @returns {CoinAmount<Native> | null} - The gas price in the smallest denomination of the chain's currency,
  *  or null if no gas price is available
  */
+// eslint-disable-next-line max-len
 const fetchGasPrice = async (provider, nativeToken) => {
-    const feeData = await provider.getFeeData().catch(() => null);
+    const feeData = await getFeeData(provider).catch(() => null);
     if (!feeData)
         return null;
-    if (doesChainSupportEIP1559$1(feeData)) {
-        return newAmount(feeData.maxFeePerGas.add(feeData.maxPriorityFeePerGas), nativeToken);
-    }
-    return feeData.gasPrice ? newAmount(feeData.gasPrice, nativeToken) : null;
+    return newAmount(feeData.maxFeePerGas, nativeToken);
 };
 /**
  * Calculate the gas fee from the gas price and gas units used for the transaction
  *
- * @param {Amount} gasPrice - The price of gas
+ * @param {CoinAmount<Native>} gasPrice - The price of gas
  * @param {BigNumber} gasEstimate - The total gas units that will be used for the transaction
  * @returns - The cost of the transaction in the gas token's smallest denomination (e.g. WEI)
  */
@@ -30569,7 +30571,7 @@ const GAS_OVERRIDES = {
     maxPriorityFeePerGas: ethers.BigNumber.from(101e9),
 };
 
-const SDK_VERSION_MARKER = '0.35.1';
+const SDK_VERSION_MARKER = '0.35.2';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 

package/dist/index.js

@@ -3769,7 +3769,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.35.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.35.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -3829,7 +3829,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.35.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.35.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4240,7 +4240,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.35.1',
+    sdkVersion: 'ts-immutable-sdk-0.35.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -8768,7 +8768,7 @@ var ChainId$1;
 (function (ChainId) {
     ChainId[ChainId["IMTBL_ZKEVM_MAINNET"] = 13371] = "IMTBL_ZKEVM_MAINNET";
     ChainId[ChainId["IMTBL_ZKEVM_TESTNET"] = 13473] = "IMTBL_ZKEVM_TESTNET";
-    ChainId[ChainId["IMTBL_ZKEVM_DEVNET"] = 13433] = "IMTBL_ZKEVM_DEVNET";
+    ChainId[ChainId["IMTBL_ZKEVM_DEVNET"] = 15003] = "IMTBL_ZKEVM_DEVNET";
     ChainId[ChainId["ETHEREUM"] = 1] = "ETHEREUM";
     ChainId[ChainId["SEPOLIA"] = 11155111] = "SEPOLIA";
 })(ChainId$1 || (ChainId$1 = {}));
@@ -28878,36 +28878,38 @@ startTokenIn = tokenIn) => {
     return routes;
 };
 
-/**
- * Determines whether or not the chain supports EIP-1559 by checking for the existence
- * of {@link FeeData.maxFeePerGas} and {@link FeeData.maxPriorityFeePerGas}
- *
- * @param {FeeData} fee - The fee data for the chain
- */
-const doesChainSupportEIP1559$1 = (fee) => {
-    const supportsEIP1559 = !!fee.maxFeePerGas && !!fee.maxPriorityFeePerGas;
-    return supportsEIP1559;
+const getFeeData = async (provider) => {
+    const [block, maxPriorityFeePerGas] = await Promise.all([
+        provider.getBlock('latest'),
+        provider.send('eth_maxPriorityFeePerGas', []),
+    ]);
+    if (!block.baseFeePerGas)
+        throw new Error('Base fee per gas not found in block');
+    return {
+        // https://www.blocknative.com/blog/eip-1559-fees
+        maxFeePerGas: block.baseFeePerGas.mul(2).add(maxPriorityFeePerGas),
+        maxPriorityFeePerGas,
+        lastBaseFeePerGas: block.baseFeePerGas,
+    };
 };
 /**
  * Fetch the current gas price estimate. Supports both EIP-1559 and non-EIP1559 chains
- * @param {JsonRpcProvider} provider - The JSON RPC provider used to fetch fee data
+ * @param {Provider} provider - The JSON RPC provider used to fetch fee data
  * @param {Native} nativeToken - The native token of the chain. Gas prices will be denominated in this token
- * @returns {Amount | null} - The gas price in the smallest denomination of the chain's currency,
+ * @returns {CoinAmount<Native> | null} - The gas price in the smallest denomination of the chain's currency,
  *  or null if no gas price is available
  */
+// eslint-disable-next-line max-len
 const fetchGasPrice = async (provider, nativeToken) => {
-    const feeData = await provider.getFeeData().catch(() => null);
+    const feeData = await getFeeData(provider).catch(() => null);
     if (!feeData)
         return null;
-    if (doesChainSupportEIP1559$1(feeData)) {
-        return newAmount(feeData.maxFeePerGas.add(feeData.maxPriorityFeePerGas), nativeToken);
-    }
-    return feeData.gasPrice ? newAmount(feeData.gasPrice, nativeToken) : null;
+    return newAmount(feeData.maxFeePerGas, nativeToken);
 };
 /**
  * Calculate the gas fee from the gas price and gas units used for the transaction
  *
- * @param {Amount} gasPrice - The price of gas
+ * @param {CoinAmount<Native>} gasPrice - The price of gas
  * @param {BigNumber} gasEstimate - The total gas units that will be used for the transaction
  * @returns - The cost of the transaction in the gas token's smallest denomination (e.g. WEI)
  */
@@ -30547,7 +30549,7 @@ const GAS_OVERRIDES = {
     maxPriorityFeePerGas: BigNumber$1.from(101e9),
 };
 
-const SDK_VERSION_MARKER = '0.35.1';
+const SDK_VERSION_MARKER = '0.35.2';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 

package/dist/passport.js

@@ -2191,7 +2191,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.35.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.35.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -2247,7 +2247,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.35.1',
+    sdkVersion: 'ts-immutable-sdk-0.35.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -6758,7 +6758,7 @@ var ChainId;
 (function (ChainId) {
     ChainId[ChainId["IMTBL_ZKEVM_MAINNET"] = 13371] = "IMTBL_ZKEVM_MAINNET";
     ChainId[ChainId["IMTBL_ZKEVM_TESTNET"] = 13473] = "IMTBL_ZKEVM_TESTNET";
-    ChainId[ChainId["IMTBL_ZKEVM_DEVNET"] = 13433] = "IMTBL_ZKEVM_DEVNET";
+    ChainId[ChainId["IMTBL_ZKEVM_DEVNET"] = 15003] = "IMTBL_ZKEVM_DEVNET";
     ChainId[ChainId["ETHEREUM"] = 1] = "ETHEREUM";
     ChainId[ChainId["SEPOLIA"] = 11155111] = "SEPOLIA";
 })(ChainId || (ChainId = {}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "0.35.1",
+  "version": "0.35.2",
   "author": "Immutable",
   "browser": "./dist/index.browser.js",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",
@@ -115,11 +115,18 @@
   "license": "Apache-2.0",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
+  "overrides": {
+    "@openzeppelin/contracts": "3.4.2-solc-0.7"
+  },
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "repository": "immutable/ts-immutable-sdk.git",
+  "resolutions": {
+    "@biom3/design-tokens": "0.2.4-beta",
+    "@openzeppelin/contracts": "3.4.2-solc-0.7"
+  },
   "scripts": {
     "build": "yarn packageList && yarn updateDependencies && yarn regenModules && rm -rf dist && NODE_ENV=production rollup --config rollup.config.js && rm -rf dist/types",
     "build:only": "rm -rf dist && NODE_ENV=production rollup --config rollup.config.js && rm -rf dist/types",