diff --git a/package.json b/package.json
index b80de5c1..5e90e8b3 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
   },
   "homepage": "https://github.com/bgd-labs/aave-address-book#readme",
   "devDependencies": {
-    "@bgd-labs/js-utils": "^1.1.0",
+    "@bgd-labs/js-utils": "^1.1.1",
     "@types/node": "^20.10.5",
     "esbuild-plugin-file-path-extensions": "^2.0.0",
     "prettier": "^3.0.3",
@@ -55,6 +55,6 @@
     "tsup": "^8.0.1",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
-    "viem": "^2.1.1"
+    "viem": "^2.5.0"
   }
 }
diff --git a/scripts/generator/governanceV3Generator.ts b/scripts/generator/governanceV3Generator.ts
index 98e8c0cc..089e93bc 100644
--- a/scripts/generator/governanceV3Generator.ts
+++ b/scripts/generator/governanceV3Generator.ts
@@ -1,5 +1,5 @@
 import {writeFileSync} from 'fs';
-import {Hex, PublicClient, getContract, Address} from 'viem';
+import {Hex, getContract, Address, Client} from 'viem';
 import {Addresses, GovernanceConfig} from '../configs/types';
 import {
   generateJsConstants,
@@ -20,7 +20,7 @@ type ExecutorsV3 = {
 };
 
 async function fetchV3ExecutorAddresses(
-  client: PublicClient,
+  client: Client,
   payloadsController: Hex,
 ): Promise<ExecutorsV3> {
   const payloadsControllerContract = getContract({
@@ -39,7 +39,7 @@ async function fetchV3ExecutorAddresses(
   };
 }
 
-async function getVotingStrategyAndWarehouse(votingMachine: Address, client: PublicClient) {
+async function getVotingStrategyAndWarehouse(votingMachine: Address, client: Client) {
   const votingMachineContract = getContract({
     address: votingMachine,
     abi: IVotingMachineWithProofs_ABI,
@@ -59,7 +59,7 @@ async function getVotingStrategyAndWarehouse(votingMachine: Address, client: Pub
   };
 }
 
-function getGovernancePowerStrategy(governance: Address, client: PublicClient) {
+function getGovernancePowerStrategy(governance: Address, client: Client) {
   if (!governance) throw new Error('trying to fetch power strategy from address 0');
 
   const governanceContract = getContract({
diff --git a/scripts/generator/protocolV2Generator.ts b/scripts/generator/protocolV2Generator.ts
index cfe4351a..2600656e 100644
--- a/scripts/generator/protocolV2Generator.ts
+++ b/scripts/generator/protocolV2Generator.ts
@@ -1,4 +1,4 @@
-import {Hex, PublicClient, getContract} from 'viem';
+import {Hex, Client, getContract} from 'viem';
 import {AddressInfo, PoolConfig, ReserveData} from '../configs/types';
 import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils';
 import {appendFileSync, writeFileSync} from 'fs';
@@ -34,7 +34,7 @@ export interface PoolV2Addresses {
 }
 
 async function getAdditionalTokenInfo(
-  client: PublicClient,
+  client: Client,
   pool: Hex,
   reservesData: PoolV2Addresses['reservesData'],
 ): Promise<{
@@ -75,7 +75,7 @@ async function getAdditionalTokenInfo(
 }
 
 export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addresses> {
-  const client = CHAIN_ID_CLIENT_MAP[pool.chainId] as PublicClient;
+  const client = CHAIN_ID_CLIENT_MAP[pool.chainId];
   const addressProviderContract = getContract({
     address: pool.POOL_ADDRESSES_PROVIDER,
     abi: ADDRESS_PROVIDER_V2_ABI,
diff --git a/scripts/generator/protocolV3Generator.ts b/scripts/generator/protocolV3Generator.ts
index 164019d5..53674176 100644
--- a/scripts/generator/protocolV3Generator.ts
+++ b/scripts/generator/protocolV3Generator.ts
@@ -1,4 +1,4 @@
-import {Hex, PublicClient, getContract, zeroAddress} from 'viem';
+import {Hex, Client, getContract, zeroAddress} from 'viem';
 import {AddressInfo, Addresses, PoolConfig, ReserveData} from '../configs/types';
 import {ADDRESS_PROVIDER_V3_ABI} from '../abi/address_provider_v3_abi';
 import {REWARDS_CONTROLLER_ABI} from '../abi/rewardsController_v3_abi';
@@ -6,7 +6,7 @@ import {STATIC_A_TOKEN_FACTORY_ABI} from '../abi/static_a_token_factory_abi';
 import {A_TOKEN_V3_ABI} from '../abi/aToken_v3_abi';
 import {VARIABLE_DEBT_TOKEN_ABI} from '../abi/variableDebtToken_v3_abi';
 import {STABLE_DEBT_TOKEN_ABI} from '../abi/stableDebtToken_v3_abi';
-import {CHAIN_ID_CLIENT_MAP, ChainId} from '@bgd-labs/js-utils';
+import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils';
 import {appendFileSync, writeFileSync} from 'fs';
 import {
   addressOrZero,
@@ -41,7 +41,7 @@ export interface PoolV3Addresses {
 }
 
 async function getAdditionalTokenInfo(
-  client: PublicClient,
+  client: Client,
   pool: PoolConfig,
   reservesData: PoolV3Addresses['reservesData'],
 ): Promise<{
@@ -115,7 +115,7 @@ async function getAdditionalTokenInfo(
 export async function getPoolV3Addresses(
   pool: PoolConfig,
 ): Promise<PoolV3Addresses & {eModes: Map<number, string>}> {
-  const client: PublicClient = CHAIN_ID_CLIENT_MAP[pool.chainId];
+  const client = CHAIN_ID_CLIENT_MAP[pool.chainId];
   const addressProviderContract = getContract({
     address: pool.POOL_ADDRESSES_PROVIDER,
     abi: ADDRESS_PROVIDER_V3_ABI,
@@ -231,7 +231,7 @@ export async function getPoolV3Addresses(
   }
 }
 
-function generateEmodes(chainId: ChainId, eModes: Map<number, string>, libraryName: string) {
+function generateEmodes(chainId: number, eModes: Map<number, string>, libraryName: string) {
   const sorted = Array.from(eModes).sort(([keyA], [keyB]) => keyA - keyB);
   const formatted = sorted.reduce((acc, [value, label]) => {
     acc[`${label ? label.toUpperCase().replace('-', '_').replace(' ', '_') : 'NONE'}`] = {
diff --git a/scripts/generator/safetyModuleGenerator.ts b/scripts/generator/safetyModuleGenerator.ts
index c5135b03..4cac145f 100644
--- a/scripts/generator/safetyModuleGenerator.ts
+++ b/scripts/generator/safetyModuleGenerator.ts
@@ -36,7 +36,10 @@ export function generateSafetyModule() {
   fs.writeFileSync(
     `./src/ts/AaveSafetyModule.ts`,
     prefixWithGeneratedWarning(
-      generateJsConstants({chainId: ChainId.mainnet, addresses: SAFETY_MODULE}).join('\n'),
+      generateJsConstants({
+        chainId: ChainId.mainnet,
+        addresses: {...SAFETY_MODULE, CHAIN_ID: {value: ChainId.mainnet, type: 'uint256'}},
+      }).join('\n'),
     ),
   );
 
diff --git a/scripts/generator/utils.ts b/scripts/generator/utils.ts
index 1b9c572e..2fff1bdc 100644
--- a/scripts/generator/utils.ts
+++ b/scripts/generator/utils.ts
@@ -1,8 +1,9 @@
-import {Hex, PublicClient, getAddress, zeroAddress} from 'viem';
+import {Client, Hex, getAddress, zeroAddress} from 'viem';
 import {AddressInfo, Addresses} from '../configs/types';
-import {CHAIN_ID_CLIENT_MAP, ChainId} from '@bgd-labs/js-utils';
+import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils';
+import {getStorageAt} from 'viem/actions';
 
-function getExplorerLink(chainId: ChainId, address: Hex) {
+function getExplorerLink(chainId: number, address: Hex) {
   const client = CHAIN_ID_CLIENT_MAP[chainId];
   return `${client.chain?.blockExplorers?.default.url}/address/${getAddress(address)}`;
 }
@@ -25,7 +26,7 @@ export function wrapIntoSolidityLibrary(code: string[], libraryName: string) {
 }
 
 export function addressInfoToSolidityLibraryConstant(
-  chainId: ChainId,
+  chainId: number,
   key: string,
   entry: AddressInfo,
 ) {
@@ -52,7 +53,7 @@ export function generateSolidityConstants({
   chainId,
   addresses,
 }: {
-  chainId: ChainId;
+  chainId: number;
   addresses: Addresses;
 }) {
   return Object.keys(addresses).map((key) =>
@@ -60,7 +61,7 @@ export function generateSolidityConstants({
   );
 }
 
-export function addressToJsConstant(chainId: ChainId, key: string, entry: AddressInfo) {
+export function addressToJsConstant(chainId: number, key: string, entry: AddressInfo) {
   if (typeof entry === 'object') {
     if (entry.type === 'uint256') {
       return `export const ${key} = ${entry.value};\n`;
@@ -75,13 +76,7 @@ export function addressToJsConstant(chainId: ChainId, key: string, entry: Addres
   return `// ${blockExplorerLinkComment}\nexport const ${key} = '${getAddress(entry)}';\n`;
 }
 
-export function generateJsConstants({
-  chainId,
-  addresses,
-}: {
-  chainId: ChainId;
-  addresses: Addresses;
-}) {
+export function generateJsConstants({chainId, addresses}: {chainId: number; addresses: Addresses}) {
   return Object.keys(addresses).map((key) => addressToJsConstant(chainId, key, addresses[key]));
 }
 
@@ -100,8 +95,8 @@ export const bytes32toAddress = (bytes32: Hex) => {
   return getAddress(`0x${bytes32.slice(26)}`);
 };
 
-export const getImplementationStorageSlot = async (provider: PublicClient, address: Hex) => {
-  return (await provider.getStorageAt({
+export const getImplementationStorageSlot = async (client: Client, address: Hex) => {
+  return (await getStorageAt(client, {
     address,
     slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc',
   })) as Hex;
diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
index 4cb2d843..32e78a3c 100644
--- a/src/AaveV3Gnosis.sol
+++ b/src/AaveV3Gnosis.sol
@@ -6,253 +6,253 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3Gnosis {
-  // https://blockscout.com/xdai/mainnet/address/0x36616cf17557639614c1cdDb356b1B83fc0B2132
+  // https://gnosisscan.io/address/0x36616cf17557639614c1cdDb356b1B83fc0B2132
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     IPoolAddressesProvider(0x36616cf17557639614c1cdDb356b1B83fc0B2132);
 
-  // https://blockscout.com/xdai/mainnet/address/0xb50201558B00496A145fE76f7424749556E326D8
+  // https://gnosisscan.io/address/0xb50201558B00496A145fE76f7424749556E326D8
   IPool internal constant POOL = IPool(0xb50201558B00496A145fE76f7424749556E326D8);
 
-  // https://blockscout.com/xdai/mainnet/address/0x7304979ec9E4EaA0273b6A037a31c4e9e5A75D16
+  // https://gnosisscan.io/address/0x7304979ec9E4EaA0273b6A037a31c4e9e5A75D16
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
     IPoolConfigurator(0x7304979ec9E4EaA0273b6A037a31c4e9e5A75D16);
 
-  // https://blockscout.com/xdai/mainnet/address/0xeb0a051be10228213BAEb449db63719d6742F7c4
+  // https://gnosisscan.io/address/0xeb0a051be10228213BAEb449db63719d6742F7c4
   IAaveOracle internal constant ORACLE = IAaveOracle(0xeb0a051be10228213BAEb449db63719d6742F7c4);
 
-  // https://blockscout.com/xdai/mainnet/address/0x0000000000000000000000000000000000000000
+  // https://gnosisscan.io/address/0x0000000000000000000000000000000000000000
   address internal constant PRICE_ORACLE_SENTINEL = 0x0000000000000000000000000000000000000000;
 
-  // https://blockscout.com/xdai/mainnet/address/0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741
+  // https://gnosisscan.io/address/0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IPoolDataProvider(0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741);
 
-  // https://blockscout.com/xdai/mainnet/address/0xEc710f59005f48703908bC519D552Df5B8472614
+  // https://gnosisscan.io/address/0xEc710f59005f48703908bC519D552Df5B8472614
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xEc710f59005f48703908bC519D552Df5B8472614);
 
-  // https://blockscout.com/xdai/mainnet/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
+  // https://gnosisscan.io/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
   address internal constant ACL_ADMIN = 0x1dF462e2712496373A347f8ad10802a5E95f053D;
 
-  // https://blockscout.com/xdai/mainnet/address/0x3e652E97ff339B73421f824F5b03d75b62F1Fb51
+  // https://gnosisscan.io/address/0x3e652E97ff339B73421f824F5b03d75b62F1Fb51
   ICollector internal constant COLLECTOR = ICollector(0x3e652E97ff339B73421f824F5b03d75b62F1Fb51);
 
-  // https://blockscout.com/xdai/mainnet/address/0xaD4F91D26254B6B0C6346b390dDA2991FDE2F20d
+  // https://gnosisscan.io/address/0xaD4F91D26254B6B0C6346b390dDA2991FDE2F20d
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0xaD4F91D26254B6B0C6346b390dDA2991FDE2F20d;
 
-  // https://blockscout.com/xdai/mainnet/address/0x589750BA8aF186cE5B55391B0b7148cAD43a1619
+  // https://gnosisscan.io/address/0x589750BA8aF186cE5B55391B0b7148cAD43a1619
   address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0x589750BA8aF186cE5B55391B0b7148cAD43a1619;
 
-  // https://blockscout.com/xdai/mainnet/address/0xBeC519531F0E78BcDdB295242fA4EC5251B38574
+  // https://gnosisscan.io/address/0xBeC519531F0E78BcDdB295242fA4EC5251B38574
   address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
     0xBeC519531F0E78BcDdB295242fA4EC5251B38574;
 
-  // https://blockscout.com/xdai/mainnet/address/0x06C35Cfd3FC61eC2aC437f0d08840d5776b945af
+  // https://gnosisscan.io/address/0x06C35Cfd3FC61eC2aC437f0d08840d5776b945af
   address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
     0x06C35Cfd3FC61eC2aC437f0d08840d5776b945af;
 
-  // https://blockscout.com/xdai/mainnet/address/0x41585C50524fb8c3899B43D7D797d9486AAc94DB
+  // https://gnosisscan.io/address/0x41585C50524fb8c3899B43D7D797d9486AAc94DB
   address internal constant EMISSION_MANAGER = 0x41585C50524fb8c3899B43D7D797d9486AAc94DB;
 
-  // https://blockscout.com/xdai/mainnet/address/0x3238FC1d642b60F41a35f62570237656C85F4744
+  // https://gnosisscan.io/address/0x3238FC1d642b60F41a35f62570237656C85F4744
   address internal constant CONFIG_ENGINE = 0x3238FC1d642b60F41a35f62570237656C85F4744;
 
-  // https://blockscout.com/xdai/mainnet/address/0x1236010CECea55998384e795B59815D871f5f94d
+  // https://gnosisscan.io/address/0x1236010CECea55998384e795B59815D871f5f94d
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x1236010CECea55998384e795B59815D871f5f94d;
 
-  // https://blockscout.com/xdai/mainnet/address/0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25
+  // https://gnosisscan.io/address/0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25
   address internal constant RATES_FACTORY = 0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25;
 
-  // https://blockscout.com/xdai/mainnet/address/0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9
+  // https://gnosisscan.io/address/0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9;
 
-  // https://blockscout.com/xdai/mainnet/address/0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809
+  // https://gnosisscan.io/address/0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809
   address internal constant UI_POOL_DATA_PROVIDER = 0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809;
 
-  // https://blockscout.com/xdai/mainnet/address/0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D
+  // https://gnosisscan.io/address/0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D
   address internal constant WALLET_BALANCE_PROVIDER = 0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D;
 
-  // https://blockscout.com/xdai/mainnet/address/0xfE76366A986B72c3f2923e05E6ba07b7de5401e4
+  // https://gnosisscan.io/address/0xfE76366A986B72c3f2923e05E6ba07b7de5401e4
   address internal constant WETH_GATEWAY = 0xfE76366A986B72c3f2923e05E6ba07b7de5401e4;
 
-  // https://blockscout.com/xdai/mainnet/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
+  // https://gnosisscan.io/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x33AE1f41546a2e05368Bf789b3d868813c0Ae658;
 
-  // https://blockscout.com/xdai/mainnet/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
+  // https://gnosisscan.io/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
   address internal constant FREEZING_STEWARD = 0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5;
 
-  // https://blockscout.com/xdai/mainnet/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
+  // https://gnosisscan.io/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
   address internal constant STATIC_A_TOKEN_FACTORY = 0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6;
 }
 
 library AaveV3GnosisAssets {
-  // https://blockscout.com/xdai/mainnet/address/0x6A023CCd1ff6F2045C3309768eAd9E68F978f6e1
+  // https://gnosisscan.io/address/0x6A023CCd1ff6F2045C3309768eAd9E68F978f6e1
   address internal constant WETH_UNDERLYING = 0x6A023CCd1ff6F2045C3309768eAd9E68F978f6e1;
 
   uint8 internal constant WETH_DECIMALS = 18;
 
-  // https://blockscout.com/xdai/mainnet/address/0xa818F1B57c201E092C4A2017A91815034326Efd1
+  // https://gnosisscan.io/address/0xa818F1B57c201E092C4A2017A91815034326Efd1
   address internal constant WETH_A_TOKEN = 0xa818F1B57c201E092C4A2017A91815034326Efd1;
 
-  // https://blockscout.com/xdai/mainnet/address/0x0c0fce05F2314540EcB095bF4D069e5E0ED90fF8
+  // https://gnosisscan.io/address/0x0c0fce05F2314540EcB095bF4D069e5E0ED90fF8
   address internal constant WETH_V_TOKEN = 0x0c0fce05F2314540EcB095bF4D069e5E0ED90fF8;
 
-  // https://blockscout.com/xdai/mainnet/address/0x436D82d905b014926a2375C576500B6fea0D2496
+  // https://gnosisscan.io/address/0x436D82d905b014926a2375C576500B6fea0D2496
   address internal constant WETH_S_TOKEN = 0x436D82d905b014926a2375C576500B6fea0D2496;
 
-  // https://blockscout.com/xdai/mainnet/address/0xa767f745331D267c7751297D982b050c93985627
+  // https://gnosisscan.io/address/0xa767f745331D267c7751297D982b050c93985627
   address internal constant WETH_ORACLE = 0xa767f745331D267c7751297D982b050c93985627;
 
-  // https://blockscout.com/xdai/mainnet/address/0xD84d86083010FB683f1e8fA3809ee8DC90A4C4DB
+  // https://gnosisscan.io/address/0xD84d86083010FB683f1e8fA3809ee8DC90A4C4DB
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xD84d86083010FB683f1e8fA3809ee8DC90A4C4DB;
 
-  // https://blockscout.com/xdai/mainnet/address/0xD843FB478c5aA9759FeA3f3c98D467e2F136190a
+  // https://gnosisscan.io/address/0xD843FB478c5aA9759FeA3f3c98D467e2F136190a
   address internal constant WETH_STATA_TOKEN = 0xD843FB478c5aA9759FeA3f3c98D467e2F136190a;
 
-  // https://blockscout.com/xdai/mainnet/address/0x6C76971f98945AE98dD7d4DFcA8711ebea946eA6
+  // https://gnosisscan.io/address/0x6C76971f98945AE98dD7d4DFcA8711ebea946eA6
   address internal constant wstETH_UNDERLYING = 0x6C76971f98945AE98dD7d4DFcA8711ebea946eA6;
 
   uint8 internal constant wstETH_DECIMALS = 18;
 
-  // https://blockscout.com/xdai/mainnet/address/0x23e4E76D01B2002BE436CE8d6044b0aA2f68B68a
+  // https://gnosisscan.io/address/0x23e4E76D01B2002BE436CE8d6044b0aA2f68B68a
   address internal constant wstETH_A_TOKEN = 0x23e4E76D01B2002BE436CE8d6044b0aA2f68B68a;
 
-  // https://blockscout.com/xdai/mainnet/address/0x9D881f67F20B49243c98f53d2B9E91E39d02Ae09
+  // https://gnosisscan.io/address/0x9D881f67F20B49243c98f53d2B9E91E39d02Ae09
   address internal constant wstETH_V_TOKEN = 0x9D881f67F20B49243c98f53d2B9E91E39d02Ae09;
 
-  // https://blockscout.com/xdai/mainnet/address/0x5CBc43c339F5202D2dcB59583D33cA8498b75031
+  // https://gnosisscan.io/address/0x5CBc43c339F5202D2dcB59583D33cA8498b75031
   address internal constant wstETH_S_TOKEN = 0x5CBc43c339F5202D2dcB59583D33cA8498b75031;
 
-  // https://blockscout.com/xdai/mainnet/address/0xcb0670258e5961CCA85D8F71D29C1167Ef20De99
+  // https://gnosisscan.io/address/0xcb0670258e5961CCA85D8F71D29C1167Ef20De99
   address internal constant wstETH_ORACLE = 0xcb0670258e5961CCA85D8F71D29C1167Ef20De99;
 
-  // https://blockscout.com/xdai/mainnet/address/0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b
+  // https://gnosisscan.io/address/0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b
   address internal constant wstETH_INTEREST_RATE_STRATEGY =
     0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b;
 
-  // https://blockscout.com/xdai/mainnet/address/0xECfD0638175e291BA3F784A58FB9D38a25418904
+  // https://gnosisscan.io/address/0xECfD0638175e291BA3F784A58FB9D38a25418904
   address internal constant wstETH_STATA_TOKEN = 0xECfD0638175e291BA3F784A58FB9D38a25418904;
 
-  // https://blockscout.com/xdai/mainnet/address/0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb
+  // https://gnosisscan.io/address/0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb
   address internal constant GNO_UNDERLYING = 0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb;
 
   uint8 internal constant GNO_DECIMALS = 18;
 
-  // https://blockscout.com/xdai/mainnet/address/0xA1Fa064A85266E2Ca82DEe5C5CcEC84DF445760e
+  // https://gnosisscan.io/address/0xA1Fa064A85266E2Ca82DEe5C5CcEC84DF445760e
   address internal constant GNO_A_TOKEN = 0xA1Fa064A85266E2Ca82DEe5C5CcEC84DF445760e;
 
-  // https://blockscout.com/xdai/mainnet/address/0xBc59E99198DbA71985A66E1713cC89FFEC53f7FC
+  // https://gnosisscan.io/address/0xBc59E99198DbA71985A66E1713cC89FFEC53f7FC
   address internal constant GNO_V_TOKEN = 0xBc59E99198DbA71985A66E1713cC89FFEC53f7FC;
 
-  // https://blockscout.com/xdai/mainnet/address/0x1A126F613D7705E59ADb39909b25E1223aDF05dd
+  // https://gnosisscan.io/address/0x1A126F613D7705E59ADb39909b25E1223aDF05dd
   address internal constant GNO_S_TOKEN = 0x1A126F613D7705E59ADb39909b25E1223aDF05dd;
 
-  // https://blockscout.com/xdai/mainnet/address/0x22441d81416430A54336aB28765abd31a792Ad37
+  // https://gnosisscan.io/address/0x22441d81416430A54336aB28765abd31a792Ad37
   address internal constant GNO_ORACLE = 0x22441d81416430A54336aB28765abd31a792Ad37;
 
-  // https://blockscout.com/xdai/mainnet/address/0x777fDAB3C03aA63d7d7CbCbaB22724cEe50F1731
+  // https://gnosisscan.io/address/0x777fDAB3C03aA63d7d7CbCbaB22724cEe50F1731
   address internal constant GNO_INTEREST_RATE_STRATEGY = 0x777fDAB3C03aA63d7d7CbCbaB22724cEe50F1731;
 
-  // https://blockscout.com/xdai/mainnet/address/0x2D737e2B0e175f05D0904C208d6C4e40da570f65
+  // https://gnosisscan.io/address/0x2D737e2B0e175f05D0904C208d6C4e40da570f65
   address internal constant GNO_STATA_TOKEN = 0x2D737e2B0e175f05D0904C208d6C4e40da570f65;
 
-  // https://blockscout.com/xdai/mainnet/address/0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83
+  // https://gnosisscan.io/address/0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83
   address internal constant USDC_UNDERLYING = 0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83;
 
   uint8 internal constant USDC_DECIMALS = 6;
 
-  // https://blockscout.com/xdai/mainnet/address/0xc6B7AcA6DE8a6044E0e32d0c841a89244A10D284
+  // https://gnosisscan.io/address/0xc6B7AcA6DE8a6044E0e32d0c841a89244A10D284
   address internal constant USDC_A_TOKEN = 0xc6B7AcA6DE8a6044E0e32d0c841a89244A10D284;
 
-  // https://blockscout.com/xdai/mainnet/address/0x5F6f7B0a87CA3CF3d0b431Ae03EF3305180BFf4d
+  // https://gnosisscan.io/address/0x5F6f7B0a87CA3CF3d0b431Ae03EF3305180BFf4d
   address internal constant USDC_V_TOKEN = 0x5F6f7B0a87CA3CF3d0b431Ae03EF3305180BFf4d;
 
-  // https://blockscout.com/xdai/mainnet/address/0x8220133C3a631de3C7A5B679A2417BD61431FEcf
+  // https://gnosisscan.io/address/0x8220133C3a631de3C7A5B679A2417BD61431FEcf
   address internal constant USDC_S_TOKEN = 0x8220133C3a631de3C7A5B679A2417BD61431FEcf;
 
-  // https://blockscout.com/xdai/mainnet/address/0x26C31ac71010aF62E6B486D1132E266D6298857D
+  // https://gnosisscan.io/address/0x26C31ac71010aF62E6B486D1132E266D6298857D
   address internal constant USDC_ORACLE = 0x26C31ac71010aF62E6B486D1132E266D6298857D;
 
-  // https://blockscout.com/xdai/mainnet/address/0xE74CD4ADF9103370144c327457bd294753E2E856
+  // https://gnosisscan.io/address/0xE74CD4ADF9103370144c327457bd294753E2E856
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0xE74CD4ADF9103370144c327457bd294753E2E856;
 
-  // https://blockscout.com/xdai/mainnet/address/0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB
+  // https://gnosisscan.io/address/0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB
   address internal constant USDC_STATA_TOKEN = 0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB;
 
-  // https://blockscout.com/xdai/mainnet/address/0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d
+  // https://gnosisscan.io/address/0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d
   address internal constant WXDAI_UNDERLYING = 0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d;
 
   uint8 internal constant WXDAI_DECIMALS = 18;
 
-  // https://blockscout.com/xdai/mainnet/address/0xd0Dd6cEF72143E22cCED4867eb0d5F2328715533
+  // https://gnosisscan.io/address/0xd0Dd6cEF72143E22cCED4867eb0d5F2328715533
   address internal constant WXDAI_A_TOKEN = 0xd0Dd6cEF72143E22cCED4867eb0d5F2328715533;
 
-  // https://blockscout.com/xdai/mainnet/address/0x281963D7471eCdC3A2Bd4503e24e89691cfe420D
+  // https://gnosisscan.io/address/0x281963D7471eCdC3A2Bd4503e24e89691cfe420D
   address internal constant WXDAI_V_TOKEN = 0x281963D7471eCdC3A2Bd4503e24e89691cfe420D;
 
-  // https://blockscout.com/xdai/mainnet/address/0xaC8b1cE0548C69318920C3e0b21Db296d5770D57
+  // https://gnosisscan.io/address/0xaC8b1cE0548C69318920C3e0b21Db296d5770D57
   address internal constant WXDAI_S_TOKEN = 0xaC8b1cE0548C69318920C3e0b21Db296d5770D57;
 
-  // https://blockscout.com/xdai/mainnet/address/0x678df3415fc31947dA4324eC63212874be5a82f8
+  // https://gnosisscan.io/address/0x678df3415fc31947dA4324eC63212874be5a82f8
   address internal constant WXDAI_ORACLE = 0x678df3415fc31947dA4324eC63212874be5a82f8;
 
-  // https://blockscout.com/xdai/mainnet/address/0xE74CD4ADF9103370144c327457bd294753E2E856
+  // https://gnosisscan.io/address/0xE74CD4ADF9103370144c327457bd294753E2E856
   address internal constant WXDAI_INTEREST_RATE_STRATEGY =
     0xE74CD4ADF9103370144c327457bd294753E2E856;
 
-  // https://blockscout.com/xdai/mainnet/address/0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B
+  // https://gnosisscan.io/address/0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B
   address internal constant WXDAI_STATA_TOKEN = 0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B;
 
-  // https://blockscout.com/xdai/mainnet/address/0xcB444e90D8198415266c6a2724b7900fb12FC56E
+  // https://gnosisscan.io/address/0xcB444e90D8198415266c6a2724b7900fb12FC56E
   address internal constant EURe_UNDERLYING = 0xcB444e90D8198415266c6a2724b7900fb12FC56E;
 
   uint8 internal constant EURe_DECIMALS = 18;
 
-  // https://blockscout.com/xdai/mainnet/address/0xEdBC7449a9b594CA4E053D9737EC5Dc4CbCcBfb2
+  // https://gnosisscan.io/address/0xEdBC7449a9b594CA4E053D9737EC5Dc4CbCcBfb2
   address internal constant EURe_A_TOKEN = 0xEdBC7449a9b594CA4E053D9737EC5Dc4CbCcBfb2;
 
-  // https://blockscout.com/xdai/mainnet/address/0xb96404e475f337A7E98e4a541C9b71309BB66c5A
+  // https://gnosisscan.io/address/0xb96404e475f337A7E98e4a541C9b71309BB66c5A
   address internal constant EURe_V_TOKEN = 0xb96404e475f337A7E98e4a541C9b71309BB66c5A;
 
-  // https://blockscout.com/xdai/mainnet/address/0x916E13857FeeD0d982Df148DBe8d8542519aB96e
+  // https://gnosisscan.io/address/0x916E13857FeeD0d982Df148DBe8d8542519aB96e
   address internal constant EURe_S_TOKEN = 0x916E13857FeeD0d982Df148DBe8d8542519aB96e;
 
-  // https://blockscout.com/xdai/mainnet/address/0xab70BCB260073d036d1660201e9d5405F5829b7a
+  // https://gnosisscan.io/address/0xab70BCB260073d036d1660201e9d5405F5829b7a
   address internal constant EURe_ORACLE = 0xab70BCB260073d036d1660201e9d5405F5829b7a;
 
-  // https://blockscout.com/xdai/mainnet/address/0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450
+  // https://gnosisscan.io/address/0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450
   address internal constant EURe_INTEREST_RATE_STRATEGY =
     0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450;
 
-  // https://blockscout.com/xdai/mainnet/address/0x8418D17640a74F1614AC3E1826F29e78714488a1
+  // https://gnosisscan.io/address/0x8418D17640a74F1614AC3E1826F29e78714488a1
   address internal constant EURe_STATA_TOKEN = 0x8418D17640a74F1614AC3E1826F29e78714488a1;
 
-  // https://blockscout.com/xdai/mainnet/address/0xaf204776c7245bF4147c2612BF6e5972Ee483701
+  // https://gnosisscan.io/address/0xaf204776c7245bF4147c2612BF6e5972Ee483701
   address internal constant sDAI_UNDERLYING = 0xaf204776c7245bF4147c2612BF6e5972Ee483701;
 
   uint8 internal constant sDAI_DECIMALS = 18;
 
-  // https://blockscout.com/xdai/mainnet/address/0x7a5c3860a77a8DC1b225BD46d0fb2ac1C6D191BC
+  // https://gnosisscan.io/address/0x7a5c3860a77a8DC1b225BD46d0fb2ac1C6D191BC
   address internal constant sDAI_A_TOKEN = 0x7a5c3860a77a8DC1b225BD46d0fb2ac1C6D191BC;
 
-  // https://blockscout.com/xdai/mainnet/address/0x8Fe06E1D8Aff42Bf6812CacF7854A2249a00bED7
+  // https://gnosisscan.io/address/0x8Fe06E1D8Aff42Bf6812CacF7854A2249a00bED7
   address internal constant sDAI_V_TOKEN = 0x8Fe06E1D8Aff42Bf6812CacF7854A2249a00bED7;
 
-  // https://blockscout.com/xdai/mainnet/address/0xa2E0335175Da40b081717FfD394C0E1de738cb9B
+  // https://gnosisscan.io/address/0xa2E0335175Da40b081717FfD394C0E1de738cb9B
   address internal constant sDAI_S_TOKEN = 0xa2E0335175Da40b081717FfD394C0E1de738cb9B;
 
-  // https://blockscout.com/xdai/mainnet/address/0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2
+  // https://gnosisscan.io/address/0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2
   address internal constant sDAI_ORACLE = 0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2;
 
-  // https://blockscout.com/xdai/mainnet/address/0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450
+  // https://gnosisscan.io/address/0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450
   address internal constant sDAI_INTEREST_RATE_STRATEGY =
     0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450;
 
-  // https://blockscout.com/xdai/mainnet/address/0xf3f45960f8dE00D8ED614D445a5a268c6F6Dec4f
+  // https://gnosisscan.io/address/0xf3f45960f8dE00D8ED614D445a5a268c6F6Dec4f
   address internal constant sDAI_STATA_TOKEN = 0xf3f45960f8dE00D8ED614D445a5a268c6F6Dec4f;
 }
 
diff --git a/src/GovernanceV3Gnosis.sol b/src/GovernanceV3Gnosis.sol
index 07191aaf..bdf7107a 100644
--- a/src/GovernanceV3Gnosis.sol
+++ b/src/GovernanceV3Gnosis.sol
@@ -5,22 +5,22 @@ pragma solidity >=0.6.0;
 import {IGovernanceCore, IPayloadsControllerCore, IDataWarehouse, IVotingStrategy} from './GovernanceV3.sol';
 
 library GovernanceV3Gnosis {
-  // https://blockscout.com/xdai/mainnet/address/0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F
+  // https://gnosisscan.io/address/0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F
   address internal constant CROSS_CHAIN_CONTROLLER = 0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F;
 
-  // https://blockscout.com/xdai/mainnet/address/0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D
+  // https://gnosisscan.io/address/0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D
   address internal constant CL_EMERGENCY_ORACLE = 0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D;
 
-  // https://blockscout.com/xdai/mainnet/address/0x9A1F491B86D09fC1484b5fab10041B189B60756b
+  // https://gnosisscan.io/address/0x9A1F491B86D09fC1484b5fab10041B189B60756b
   IPayloadsControllerCore internal constant PAYLOADS_CONTROLLER =
     IPayloadsControllerCore(0x9A1F491B86D09fC1484b5fab10041B189B60756b);
 
-  // https://blockscout.com/xdai/mainnet/address/0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672
+  // https://gnosisscan.io/address/0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672
   address internal constant PC_DATA_HELPER = 0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672;
 
-  // https://blockscout.com/xdai/mainnet/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
+  // https://gnosisscan.io/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
   address internal constant EXECUTOR_LVL_1 = 0x1dF462e2712496373A347f8ad10802a5E95f053D;
 
-  // https://blockscout.com/xdai/mainnet/address/0x0000000000000000000000000000000000000000
+  // https://gnosisscan.io/address/0x0000000000000000000000000000000000000000
   address internal constant EXECUTOR_LVL_2 = 0x0000000000000000000000000000000000000000;
 }
diff --git a/src/MiscGnosis.sol b/src/MiscGnosis.sol
index ff5c3c69..9a23585b 100644
--- a/src/MiscGnosis.sol
+++ b/src/MiscGnosis.sol
@@ -3,15 +3,15 @@
 pragma solidity >=0.6.0;
 
 library MiscGnosis {
-  // https://blockscout.com/xdai/mainnet/address/0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A
+  // https://gnosisscan.io/address/0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A
   address internal constant TRANSPARENT_PROXY_FACTORY = 0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A;
 
-  // https://blockscout.com/xdai/mainnet/address/0xe892E40C92c2E4D281Be59b2E6300F271d824E75
+  // https://gnosisscan.io/address/0xe892E40C92c2E4D281Be59b2E6300F271d824E75
   address internal constant PROXY_ADMIN = 0xe892E40C92c2E4D281Be59b2E6300F271d824E75;
 
-  // https://blockscout.com/xdai/mainnet/address/0x2cC41488f4494c5e11cB6cbA82199442B9f495B6
+  // https://gnosisscan.io/address/0x2cC41488f4494c5e11cB6cbA82199442B9f495B6
   address internal constant CREATE_3_FACTORY = 0x2cC41488f4494c5e11cB6cbA82199442B9f495B6;
 
-  // https://blockscout.com/xdai/mainnet/address/0xF163b8698821cefbD33Cf449764d69Ea445cE23D
+  // https://gnosisscan.io/address/0xF163b8698821cefbD33Cf449764d69Ea445cE23D
   address internal constant PROTOCOL_GUARDIAN = 0xF163b8698821cefbD33Cf449764d69Ea445cE23D;
 }
diff --git a/src/ts/AaveSafetyModule.ts b/src/ts/AaveSafetyModule.ts
index c83a6dca..666b624a 100644
--- a/src/ts/AaveSafetyModule.ts
+++ b/src/ts/AaveSafetyModule.ts
@@ -19,3 +19,5 @@ export const STK_AAVE_WSTETH_BPTV2 = '0x9eDA81C21C273a82BE9Bbc19B6A6182212068101
 
 // https://etherscan.io/address/0xADf86b537eF08591c2777E144322E8b0Ca7E82a7
 export const STK_AAVE_WSTETH_BPTV2_ORACLE = '0xADf86b537eF08591c2777E144322E8b0Ca7E82a7';
+
+export const CHAIN_ID = 1;
diff --git a/src/ts/AaveV3Gnosis.ts b/src/ts/AaveV3Gnosis.ts
index 334cb0be..a42c8014 100644
--- a/src/ts/AaveV3Gnosis.ts
+++ b/src/ts/AaveV3Gnosis.ts
@@ -1,74 +1,74 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://blockscout.com/xdai/mainnet/address/0x36616cf17557639614c1cdDb356b1B83fc0B2132
+// IPoolAddressesProvider https://gnosisscan.io/address/0x36616cf17557639614c1cdDb356b1B83fc0B2132
 export const POOL_ADDRESSES_PROVIDER = '0x36616cf17557639614c1cdDb356b1B83fc0B2132';
 
-// IPool https://blockscout.com/xdai/mainnet/address/0xb50201558B00496A145fE76f7424749556E326D8
+// IPool https://gnosisscan.io/address/0xb50201558B00496A145fE76f7424749556E326D8
 export const POOL = '0xb50201558B00496A145fE76f7424749556E326D8';
 
-// IPoolConfigurator https://blockscout.com/xdai/mainnet/address/0x7304979ec9E4EaA0273b6A037a31c4e9e5A75D16
+// IPoolConfigurator https://gnosisscan.io/address/0x7304979ec9E4EaA0273b6A037a31c4e9e5A75D16
 export const POOL_CONFIGURATOR = '0x7304979ec9E4EaA0273b6A037a31c4e9e5A75D16';
 
-// IAaveOracle https://blockscout.com/xdai/mainnet/address/0xeb0a051be10228213BAEb449db63719d6742F7c4
+// IAaveOracle https://gnosisscan.io/address/0xeb0a051be10228213BAEb449db63719d6742F7c4
 export const ORACLE = '0xeb0a051be10228213BAEb449db63719d6742F7c4';
 
-// https://blockscout.com/xdai/mainnet/address/0x0000000000000000000000000000000000000000
+// https://gnosisscan.io/address/0x0000000000000000000000000000000000000000
 export const PRICE_ORACLE_SENTINEL = '0x0000000000000000000000000000000000000000';
 
-// IPoolDataProvider https://blockscout.com/xdai/mainnet/address/0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741
+// IPoolDataProvider https://gnosisscan.io/address/0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741';
 
-// IACLManager https://blockscout.com/xdai/mainnet/address/0xEc710f59005f48703908bC519D552Df5B8472614
+// IACLManager https://gnosisscan.io/address/0xEc710f59005f48703908bC519D552Df5B8472614
 export const ACL_MANAGER = '0xEc710f59005f48703908bC519D552Df5B8472614';
 
-// https://blockscout.com/xdai/mainnet/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
+// https://gnosisscan.io/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
 export const ACL_ADMIN = '0x1dF462e2712496373A347f8ad10802a5E95f053D';
 
-// ICollector https://blockscout.com/xdai/mainnet/address/0x3e652E97ff339B73421f824F5b03d75b62F1Fb51
+// ICollector https://gnosisscan.io/address/0x3e652E97ff339B73421f824F5b03d75b62F1Fb51
 export const COLLECTOR = '0x3e652E97ff339B73421f824F5b03d75b62F1Fb51';
 
-// https://blockscout.com/xdai/mainnet/address/0xaD4F91D26254B6B0C6346b390dDA2991FDE2F20d
+// https://gnosisscan.io/address/0xaD4F91D26254B6B0C6346b390dDA2991FDE2F20d
 export const DEFAULT_INCENTIVES_CONTROLLER = '0xaD4F91D26254B6B0C6346b390dDA2991FDE2F20d';
 
-// https://blockscout.com/xdai/mainnet/address/0x589750BA8aF186cE5B55391B0b7148cAD43a1619
+// https://gnosisscan.io/address/0x589750BA8aF186cE5B55391B0b7148cAD43a1619
 export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0x589750BA8aF186cE5B55391B0b7148cAD43a1619';
 
-// https://blockscout.com/xdai/mainnet/address/0xBeC519531F0E78BcDdB295242fA4EC5251B38574
+// https://gnosisscan.io/address/0xBeC519531F0E78BcDdB295242fA4EC5251B38574
 export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0xBeC519531F0E78BcDdB295242fA4EC5251B38574';
 
-// https://blockscout.com/xdai/mainnet/address/0x06C35Cfd3FC61eC2aC437f0d08840d5776b945af
+// https://gnosisscan.io/address/0x06C35Cfd3FC61eC2aC437f0d08840d5776b945af
 export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0x06C35Cfd3FC61eC2aC437f0d08840d5776b945af';
 
-// https://blockscout.com/xdai/mainnet/address/0x41585C50524fb8c3899B43D7D797d9486AAc94DB
+// https://gnosisscan.io/address/0x41585C50524fb8c3899B43D7D797d9486AAc94DB
 export const EMISSION_MANAGER = '0x41585C50524fb8c3899B43D7D797d9486AAc94DB';
 
-// https://blockscout.com/xdai/mainnet/address/0x3238FC1d642b60F41a35f62570237656C85F4744
+// https://gnosisscan.io/address/0x3238FC1d642b60F41a35f62570237656C85F4744
 export const CONFIG_ENGINE = '0x3238FC1d642b60F41a35f62570237656C85F4744';
 
-// https://blockscout.com/xdai/mainnet/address/0x1236010CECea55998384e795B59815D871f5f94d
+// https://gnosisscan.io/address/0x1236010CECea55998384e795B59815D871f5f94d
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x1236010CECea55998384e795B59815D871f5f94d';
 
-// https://blockscout.com/xdai/mainnet/address/0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25
+// https://gnosisscan.io/address/0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25
 export const RATES_FACTORY = '0x73dDE2A75c06a108912bf7Ff600eDdCE9d96Ed25';
 
-// https://blockscout.com/xdai/mainnet/address/0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9
+// https://gnosisscan.io/address/0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9
 export const UI_INCENTIVE_DATA_PROVIDER = '0xCFDAdA7DCd2e785cF706BaDBC2B8Af5084d595e9';
 
-// https://blockscout.com/xdai/mainnet/address/0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809
+// https://gnosisscan.io/address/0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809
 export const UI_POOL_DATA_PROVIDER = '0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809';
 
-// https://blockscout.com/xdai/mainnet/address/0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D
+// https://gnosisscan.io/address/0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D
 export const WALLET_BALANCE_PROVIDER = '0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D';
 
-// https://blockscout.com/xdai/mainnet/address/0xfE76366A986B72c3f2923e05E6ba07b7de5401e4
+// https://gnosisscan.io/address/0xfE76366A986B72c3f2923e05E6ba07b7de5401e4
 export const WETH_GATEWAY = '0xfE76366A986B72c3f2923e05E6ba07b7de5401e4';
 
-// https://blockscout.com/xdai/mainnet/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
+// https://gnosisscan.io/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
 export const CAPS_PLUS_RISK_STEWARD = '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658';
 
-// https://blockscout.com/xdai/mainnet/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
+// https://gnosisscan.io/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
 export const FREEZING_STEWARD = '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5';
 
-// https://blockscout.com/xdai/mainnet/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
+// https://gnosisscan.io/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
 export const STATIC_A_TOKEN_FACTORY = '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6';
 
 export const CHAIN_ID = 100;
diff --git a/src/ts/GovernanceV3Gnosis.ts b/src/ts/GovernanceV3Gnosis.ts
index e0c7437c..b07c5cac 100644
--- a/src/ts/GovernanceV3Gnosis.ts
+++ b/src/ts/GovernanceV3Gnosis.ts
@@ -1,19 +1,19 @@
-// https://blockscout.com/xdai/mainnet/address/0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F
+// https://gnosisscan.io/address/0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F
 export const CROSS_CHAIN_CONTROLLER = '0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F';
 
-// https://blockscout.com/xdai/mainnet/address/0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D
+// https://gnosisscan.io/address/0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D
 export const CL_EMERGENCY_ORACLE = '0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D';
 
-// IPayloadsControllerCore https://blockscout.com/xdai/mainnet/address/0x9A1F491B86D09fC1484b5fab10041B189B60756b
+// IPayloadsControllerCore https://gnosisscan.io/address/0x9A1F491B86D09fC1484b5fab10041B189B60756b
 export const PAYLOADS_CONTROLLER = '0x9A1F491B86D09fC1484b5fab10041B189B60756b';
 
-// https://blockscout.com/xdai/mainnet/address/0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672
+// https://gnosisscan.io/address/0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672
 export const PC_DATA_HELPER = '0xF1c11BE0b4466728DDb7991A0Ac5265646ec9672';
 
-// https://blockscout.com/xdai/mainnet/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
+// https://gnosisscan.io/address/0x1dF462e2712496373A347f8ad10802a5E95f053D
 export const EXECUTOR_LVL_1 = '0x1dF462e2712496373A347f8ad10802a5E95f053D';
 
-// https://blockscout.com/xdai/mainnet/address/0x0000000000000000000000000000000000000000
+// https://gnosisscan.io/address/0x0000000000000000000000000000000000000000
 export const EXECUTOR_LVL_2 = '0x0000000000000000000000000000000000000000';
 
 export const CHAIN_ID = 100;
diff --git a/src/ts/MiscGnosis.ts b/src/ts/MiscGnosis.ts
index bb4b65ba..7ba74ac0 100644
--- a/src/ts/MiscGnosis.ts
+++ b/src/ts/MiscGnosis.ts
@@ -1,14 +1,14 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// https://blockscout.com/xdai/mainnet/address/0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A
+// https://gnosisscan.io/address/0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A
 export const TRANSPARENT_PROXY_FACTORY = '0x47aAdaAE1F05C978E6aBb7568d11B7F6e0FC4d6A';
 
-// https://blockscout.com/xdai/mainnet/address/0xe892E40C92c2E4D281Be59b2E6300F271d824E75
+// https://gnosisscan.io/address/0xe892E40C92c2E4D281Be59b2E6300F271d824E75
 export const PROXY_ADMIN = '0xe892E40C92c2E4D281Be59b2E6300F271d824E75';
 
-// https://blockscout.com/xdai/mainnet/address/0x2cC41488f4494c5e11cB6cbA82199442B9f495B6
+// https://gnosisscan.io/address/0x2cC41488f4494c5e11cB6cbA82199442B9f495B6
 export const CREATE_3_FACTORY = '0x2cC41488f4494c5e11cB6cbA82199442B9f495B6';
 
-// https://blockscout.com/xdai/mainnet/address/0xF163b8698821cefbD33Cf449764d69Ea445cE23D
+// https://gnosisscan.io/address/0xF163b8698821cefbD33Cf449764d69Ea445cE23D
 export const PROTOCOL_GUARDIAN = '0xF163b8698821cefbD33Cf449764d69Ea445cE23D';
 
 export const CHAIN_ID = 100;
diff --git a/yarn.lock b/yarn.lock
index 6628775d..3f7d8183 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7"
   integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==
 
-"@bgd-labs/js-utils@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@bgd-labs/js-utils/-/js-utils-1.1.0.tgz#1fe9c995becb7497a6f8ec3691f87945a747b540"
-  integrity sha512-FYEt/+33HEubu0jACTOY4pqcQP3j74NGQAZe5/oD00PZCiLPMYf19zM5Mgws05r+IpE2FEb0ShMMVZRYcXwtcQ==
+"@bgd-labs/js-utils@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/js-utils/-/js-utils-1.1.1.tgz#0e400061169cd38d1dd44b401dc3c05b904cbd76"
+  integrity sha512-CWzoY+3IWpu/YhDgVYbnZhBEGQ8kGJwAgqZexrIkD9+GJh5raEcOWByV8psWapOwttWO4ppxS/RgmMdJQ5Hhxg==
   dependencies:
     "@supercharge/promise-pool" "^3.1.0"
     bs58 "^5.0.0"
@@ -308,10 +308,10 @@
   dependencies:
     undici-types "~5.26.4"
 
-abitype@0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.10.0.tgz#d3504747cc81df2acaa6c460250ef7bc9219a77c"
-  integrity sha512-QvMHEUzgI9nPj9TWtUGnS2scas80/qaL5PBxGdwWhhvzqXfOph+IEiiiWrzuisu3U3JgDQVruW9oLbJoQ3oZ3A==
+abitype@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/abitype/-/abitype-1.0.0.tgz#237176dace81d90d018bebf3a45cb42f2a2d9e97"
+  integrity sha512-NMeMah//6bJ56H5XRj8QCV4AwuW6hB6zqz2LnhhLdcWVQOsXki6/Pn3APeqxCma62nXIcmZWdu1DlHWS74umVQ==
 
 antlr4ts@^0.5.0-alpha.4:
   version "0.5.0-alpha.4"
@@ -1037,17 +1037,17 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-viem@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/viem/-/viem-2.1.1.tgz#8ab73c84d66369e80b9090626a0a8010d681e2d4"
-  integrity sha512-gJiwYceD7Dsjioglr+85GQS3u5Gp9XGG8oJqGsauBaEPFlkmbRx7cxD2Q5RZXFToVvEbarOWtITZtGHBsGv4MQ==
+viem@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-2.5.0.tgz#1d7bd5333a6b9387d42c1c2d368d0b88c2961ee1"
+  integrity sha512-ytHXIWtlgPs4mcsGxXjJrQ25v+N4dE2hBzgCU8CVv4iXNh3PRFRgyYa7igZlmxiMVzkfSHHADOtivS980JhilA==
   dependencies:
     "@adraffy/ens-normalize" "1.10.0"
     "@noble/curves" "1.2.0"
     "@noble/hashes" "1.3.2"
     "@scure/bip32" "1.3.2"
     "@scure/bip39" "1.2.1"
-    abitype "0.10.0"
+    abitype "1.0.0"
     isows "1.0.3"
     ws "8.13.0"