Merge branch 'main' into yarn-workspace

zkemail · Jul 10, 2023 · 58864c8 · 58864c8
2 parents 25391c6 + 9791e79
commit 58864c8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -5,8 +5,8 @@
     "publish": "yarn npm publish --access=public"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "^4.9.1",
-    "@openzeppelin/contracts-upgradeable": "^4.9.1",
+    "@openzeppelin/contracts": "^4.9.2",
+    "@openzeppelin/contracts-upgradeable": "^4.9.2",
     "ds-test": "https://github.com/dapphub/ds-test",
     "forge-std": "https://github.com/foundry-rs/forge-std"
   }

diff --git a/packages/twitter-verifier-app/index.jsx b/packages/twitter-verifier-app/index.jsx
@@ -3,6 +3,7 @@ import ReactDOM from "react-dom";
 import App from "./App";
 import { WagmiConfig, createClient, configureChains, chain } from "wagmi";
 import { publicProvider } from "wagmi/providers/public";
+import { infuraProvider } from "wagmi/providers/infura";
 import {
   getDefaultWallets,
   RainbowKitProvider,
@@ -14,7 +15,7 @@ import "@rainbow-me/rainbowkit/styles.css";
 
 const { chains, provider, webSocketProvider } = configureChains(
   [chain.goerli],
-  [publicProvider()]
+  [infuraProvider({ apiKey: 'd87bf713dd3a44e09e773c13a2e84cc6' }), publicProvider()]
 );
 
 const { connectors } = getDefaultWallets({

diff --git a/packages/twitter-verifier-app/pages/MainPage.tsx b/packages/twitter-verifier-app/pages/MainPage.tsx
@@ -139,7 +139,7 @@ export const MainPage: React.FC<{}> = (props) => {
   };
 
   const { config } = usePrepareContractWrite({
-    addressOrName: "0x72D9d080853f1AfA52662D71A24D92498Ef84799", // TODO: get address
+    addressOrName: "0x79c1038ce01f0af9c3a2c3cf1357acd21ff61dd2", // TODO: get address
     contractInterface: abi, // TODO: get abi
     functionName: "mint",
     args: [

diff --git a/yarn.lock b/yarn.lock
@@ -2675,13 +2675,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@openzeppelin/contracts-upgradeable@npm:^4.9.2":
+  version: 4.9.2
+  resolution: "@openzeppelin/contracts-upgradeable@npm:4.9.2"
+  checksum: 88df083e886006b9fac61848edf224a725b99e1b8a302173165a857e3bbc1d00d61cb9c71590b37d955b179fe23652fc157347a086dbaad8f66ce8470603f151
+  languageName: node
+  linkType: hard
+
 "@openzeppelin/contracts@npm:^4.9.1":
   version: 4.9.1
   resolution: "@openzeppelin/contracts@npm:4.9.1"
   checksum: 9bb3cc6aecd6c56d5ece10d9820d43e6e9c460395b75cc4af9b4e776f1a9e56c9906bc03538b0707e617dc31f1abdfffcbeedfecc8884358d864198ed73f59c1
   languageName: node
   linkType: hard
 
+"@openzeppelin/contracts@npm:^4.9.2":
+  version: 4.9.2
+  resolution: "@openzeppelin/contracts@npm:4.9.2"
+  checksum: 0538b18fe222e5414a5a539c240b155e0bef2a23c5182fb8e137d71a0c390fe899160f2d55701f75b127f54cc61aee4375370acc832475f19829368ac65c1fc6
+  languageName: node
+  linkType: hard
+
 "@pedrouid/environment@npm:^1.0.1":
   version: 1.0.1
   resolution: "@pedrouid/environment@npm:1.0.1"
@@ -3821,8 +3835,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@zk-email/contracts@workspace:packages/contracts"
   dependencies:
-    "@openzeppelin/contracts": ^4.9.1
-    "@openzeppelin/contracts-upgradeable": ^4.9.1
+    "@openzeppelin/contracts": ^4.9.2
+    "@openzeppelin/contracts-upgradeable": ^4.9.2
     ds-test: "https://github.com/dapphub/ds-test"
     forge-std: "https://github.com/foundry-rs/forge-std"
   languageName: unknown