From ae99fb899292f97498a58fece6f232f343305f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Renaud?= <clement@unlock-protocol.com>
Date: Thu, 5 Dec 2024 14:48:22 +0100
Subject: [PATCH] fix(governance,unlockjs): update evm version to shanghai
 (#15246)

update evm version to shanghai
---
 governance/hardhat.config.js         | 2 +-
 packages/unlock-js/hardhat.config.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/governance/hardhat.config.js b/governance/hardhat.config.js
index 72a7e57595d..c40dc5d0021 100644
--- a/governance/hardhat.config.js
+++ b/governance/hardhat.config.js
@@ -74,7 +74,7 @@ const config = {
     compilers: [
       // required to compile oracle as Uniswap v3-periphery supports only solc < 0.8
       { version: '0.7.6', settings: { ...settings, evmVersion: 'istanbul' } },
-      { version: '0.8.21', settings },
+      { version: '0.8.21', settings: { ...settings, evmVersion: 'shanghai' } },
     ],
   },
   sourcify: {
diff --git a/packages/unlock-js/hardhat.config.js b/packages/unlock-js/hardhat.config.js
index cf9f9dce740..960cc10c246 100644
--- a/packages/unlock-js/hardhat.config.js
+++ b/packages/unlock-js/hardhat.config.js
@@ -5,12 +5,13 @@ require('@nomicfoundation/hardhat-ethers')
 
 module.exports = {
   solidity: {
-    version: '0.8.13',
+    version: '0.8.21',
     settings: {
       optimizer: {
         enabled: true,
         runs: 10,
       },
+      evmVersion: 'shanghai',
     },
   },
 }