Merge pull request #78 from gnosis/fix-rocketpool

Route transactions through avatar Safe in simulation

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
           node-version: 16
           cache: "yarn"
           cache-dependency-path: "**/yarn.lock"
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
         working-directory: ./extension
       - name: Run static checks
         run: yarn run check

.github/workflows/e2e.yml

@@ -15,9 +15,9 @@ jobs:
       - name: Build extension
         working-directory: ./extension
         run: |
-          yarn install --frozen-lockfile
+          yarn install --immutable
           yarn build
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
         working-directory: ./e2e-tests
         env:
           PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"

.github/workflows/prod-release.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Install deps and build
         working-directory: ./extension
         run: |
-          yarn install --frozen-lockfile
+          yarn install --immutable
           yarn build
 
       - name: Update manifest.json with release tag

extension/.cspell.json

@@ -21,6 +21,7 @@
     "ethersproject",
     "getsourcecode",
     "gnosisguild",
+    "hexlify",
     "honeyswap",
     "IERC20",
     "iframes",
@@ -43,6 +44,7 @@
     "Sindre",
     "Sorhus",
     "Sourcify",
+    "staderlabs",
     "Stakewise",
     "Sushiswap",
     "toastify",

extension/.yarnrc.yml

@@ -30,4 +30,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: '@yarnpkg/plugin-interactive-tools'
 
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

extension/esbuild.js

@@ -30,7 +30,6 @@ esbuild
     inject: [require.resolve('node-stdlib-browser/helpers/esbuild/shim')],
     define: {
       'process.env.NODE_ENV': `"${process.env.NODE_ENV}"`,
-      'process.env.ETHERSCAN_API_KEY': `"${process.env.ETHERSCAN_API_KEY}"`,
       global: 'window',
     },
     plugins: [plugin(stdLibBrowser), cssModulesPlugin()],

extension/package.json

@@ -26,13 +26,13 @@
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/abstract-provider": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@gnosis.pm/zodiac": "^3.3.10",
+    "@gnosis.pm/zodiac": "^3.4.2",
     "@safe-global/api-kit": "^1.3.1",
     "@safe-global/protocol-kit": "^1.3.0",
     "@safe-global/safe-core-sdk-types": "^2.3.0",
     "@shazow/whatsabi": "^0.2.1",
     "@testing-library/jest-dom": "^5.16.1",
-    "@typechain/ethers-v5": "^10.0.0",
+    "@typechain/ethers-v5": "^10.2.1",
     "@types/chrome": "^0.0.233",
     "@types/events": "^3.0.0",
     "@types/jest": "^27.0.3",
@@ -76,14 +76,14 @@
     "react-icons": "^4.3.1",
     "react-modal": "^3.15.1",
     "react-moment": "^1.1.3",
-    "react-multisend": "^2.0.0",
+    "react-multisend": "^2.1.0",
     "react-select": "^5.2.1",
     "react-toastify": "^9.0.8",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.2",
-    "typechain": "^8.0.0",
+    "typechain": "^8.3.2",
     "typescript": "^4.9.4",
     "typescript-plugin-css-modules": "^3.4.0"
   },
-  "packageManager": "yarn@3.5.0"
+  "packageManager": "yarn@3.6.4"
 }

extension/src/browser/Drawer/CallContract.tsx

@@ -9,6 +9,7 @@ import { Box } from '../../components'
 import { useConnection } from '../../settings'
 
 import classes from './style.module.css'
+import { EXPLORER_API_KEY } from '../../networks'
 
 interface Props {
   value: CallContractTransactionInput
@@ -24,7 +25,7 @@ const CallContract: React.FC<Props> = ({ value }) => {
       /*nothing here*/
     },
     network: chainId.toString() as NetworkId,
-    blockExplorerApiKey: process.env.ETHERSCAN_API_KEY,
+    blockExplorerApiKey: EXPLORER_API_KEY[chainId],
   })
 
   return (

extension/src/browser/Drawer/Remove.tsx

@@ -4,7 +4,6 @@ import { encodeSingle, TransactionInput } from 'react-multisend'
 
 import { IconButton } from '../../components'
 import { ForkProvider } from '../../providers'
-import { useConnection } from '../../settings'
 import { useProvider } from '../ProvideProvider'
 import { useDispatch, useNewTransactions } from '../state'
 
@@ -19,7 +18,6 @@ export const Remove: React.FC<Props> = ({ transaction, index }) => {
   const provider = useProvider()
   const dispatch = useDispatch()
   const transactions = useNewTransactions()
-  const { connection } = useConnection()
 
   if (!(provider instanceof ForkProvider)) {
     // Removing transactions is only supported when using ForkProvider
@@ -45,7 +43,7 @@ export const Remove: React.FC<Props> = ({ transaction, index }) => {
     // re-simulate all transactions after the removed one
     for (const transaction of laterTransactions) {
       const encoded = encodeSingle(transaction.input)
-      await provider.sendMetaTransaction(encoded, connection)
+      await provider.sendMetaTransaction(encoded)
     }
   }