Skip to content

Commit

Permalink
Merge pull request #621 from kernel-community/r2d
Browse files Browse the repository at this point in the history
  • Loading branch information
andytudhope authored Mar 19, 2024
2 parents 13ff746 + 8cd0022 commit 8071c48
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 31 deletions.
2 changes: 1 addition & 1 deletion content/en/build/daos/expanding-universe.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Learn more about the Zodiac approach to DAO tooling and deploy your own Zodiac m
- Problem statement introduction
- Brief overview of current Zodiac collection of tools
- Zodiac Deployment (40 minutes plus 5 minute Q&A)
- Create a [Gnosis Safe](https://gnosis-safe.io/app/welcome) on a test network (we recommend Goerli)
- Create a [Gnosis Safe](https://gnosis-safe.io/app/welcome) on a test network (we recommend Sepolia)
- Deploy Zodiac Exit and Delay Modules in it, by navigating to the "Apps" section.

### Recording
Expand Down
6 changes: 3 additions & 3 deletions content/en/build/outsmarting-contracts/lifting-the-veil.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ So, we’re just going to make a whole bunch of mistakes together. We’re going
## Preparation

1. Install [MetaMask](https://metamask.io) and create an Ethereum account.
2. Switch your network (at the top of the browser pop-up) to the ‘Goerli Test Network’.
3. Signup with Alchemy to get Goerli ETH by following [these instructions](https://goerlifaucet.com/).
2. Switch your network (at the top of the browser pop-up) to the Sepolia Test Network’.
3. Signup with Alchemy to get Sepolia ETH.
4. Check that you have an up-to-date version of Chrome, Firefox, or Brave.

NOTE: At the time the videos for this guild were recorded, the Rinkeby Testnet was being used. That testnet has now [been deprecated](https://www.alchemy.com/overviews/rinkeby-testnet) by the Etherium Foundation. Whenever 'Rinkeby Testnet' or 'Rinkeby ETH' are mentioned in the recordings, simply translate this in your mind to 'Goerli Testnet' or 'Goerli ETH'.
NOTE: At the time the videos for this guild were recorded, the Rinkeby Testnet was being used. That testnet has now [been deprecated](https://www.alchemy.com/overviews/rinkeby-testnet) by the Etherium Foundation. Whenever 'Rinkeby Testnet' or 'Rinkeby ETH' are mentioned in the recordings, simply translate this in your mind to 'Sepolia Testnet' or 'Sepolia ETH'.

## Application

Expand Down
2 changes: 1 addition & 1 deletion content/en/build/outsmarting-contracts/random-order.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ By becoming conscious of our limitations and weakness, we are made stronger and

## Preparation

1. Ensure that you still have some Goerli ETH left in your account. Use the [faucet](https://goerlifaucet.com/) if you need to top up.
1. Ensure that you still have some Sepolia ETH left in your account.
2. If you feel highly motivated, familiarise yourself with Integrated Development Environments (IDEs) and [Remix](https://remix.ethereum.org/).
3. Sit and breathe quietly for at least 10 minutes.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ We’ll be playing for the throne, going for the top floor, and re-entering a co

## Preparation

1. Ensure that you still have some Goerli ETH left in your account. Use the [faucet](https://goerlifaucet.com/) if you need to top up.
1. Ensure that you still have some Sepolia ETH left in your account.
2. Read about The DAO hack.
3. Sit and breathe quietly for at least 20 minutes. Use this [music](https://www.youtube.com/watch?v=g_LNp8xY1YM) if it helps. Or [this](https://www.youtube.com/watch?v=b5H3b_Hh0Lw).

Expand Down
2 changes: 1 addition & 1 deletion content/en/build/outsmarting-contracts/true-store.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ All this and more lies in wait for us as we continue our journey into shared tru

## Preparation

1. Ensure that you still have some Goerli ETH left in your account. Use the [faucet](https://goerlifaucet.com/) if you need to top up.
1. Ensure that you still have some Sepolia ETH left in your account.
2. Review Remix and the work we did there last week. We’ll only use it once, at the end of our session today, but it’s still worth being familiar with.
3. Sit and breathe quietly for at least 15 minutes.

Expand Down
8 changes: 4 additions & 4 deletions content/en/tokens/token-studies/honour.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ We propose a peer-to-peer system of social credit. It is open, permissionless, a

</Aligner>

_Note: in this case, the [original Google Doc](https://docs.google.com/document/d/1mdWJhBFrGx0OBJbx5fceLZSEI1zvkVuJhQwgVhpxOas/edit?usp=sharing) is more revealing, because you can see the ongoing conversations. This system is not yet in production, but you can [explore v1 on goerli here](https://honour.community)._

<Aligner center>

<Flex sx={{alignItems: 'center'}}>

<Button to='https://github.com/kernel-community/honour' secondary inline>
Audit the code
<Button to='https://honour.community' secondary inline>
Make money weird
</Button>

</Flex>

</Aligner>

_Note: the [original Google Doc](https://docs.google.com/document/d/1mdWJhBFrGx0OBJbx5fceLZSEI1zvkVuJhQwgVhpxOas/edit?usp=sharing) reveals the many ongoing conversations about how weird we can make money. You can explore the code [here](https://github.com/kernel-community/honour)._

## Money Made Weird

The word “weird” can be traced to “_wyrd_”, meaning destiny. To call someone “weird” is to say they are destined: their presence has that strange and sometimes unsettling sense of something greater. To make something weird is to wire it to reach its destination, knowing well that each thing is destined for the origin from whence it emerged.
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mdx-js/react": "^1.6.22",
"@theme-ui/prism": "^0.14.7",
"axios": "^1.2.0",
"date-fns": "^2.30.0",
"date-fns": "^3.3.1",
"del": "^6.0.0",
"dotenv": "^16.0.3",
"ethers": "^5.6.8",
Expand All @@ -34,7 +34,7 @@
"gatsby-plugin-sharp": "^3.15.0",
"gatsby-plugin-sitemap": "^3.3.0",
"gatsby-plugin-theme-ui": "^0.13.1",
"gatsby-remark-autolink-headers": "^4.11.0",
"gatsby-remark-autolink-headers": "^4.12.0",
"gatsby-remark-code-titles": "^1.1.0",
"gatsby-remark-embed-video": "^3.2.1",
"gatsby-remark-images": "^5.12.0",
Expand All @@ -44,7 +44,7 @@
"gatsby-transformer-remark": "^4.11.0",
"gatsby-transformer-sharp": "^3.15.0",
"html-react-parser": "^5.0.11",
"immer": "^10.0.2",
"immer": "^10.0.3",
"lodash": "^4.17.21",
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1",
Expand Down
1 change: 1 addition & 0 deletions src/honour/constants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const goerli = '0x80c25Df6014253FE78f4Ec6258F73855dEe09A6c'
export const optimism = '0xB123B2d5C0932F2B13Fcf03763004f0800fF29dD'

// This is the pub key of the account in our api
export const proposer = '0x4Daf7C338134C0Bf9aaB7C4D7dEa6e8418385c29'
Expand Down
4 changes: 2 additions & 2 deletions src/modules/pageMoneySpeech/HonourConnector.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import { jsx } from 'theme-ui'
import { useState } from 'react'
import { ethers } from 'ethers'
import { useContractRead } from 'wagmi'
import { goerli, abis } from '../../honour/constants'
import { optimism, abis } from '../../honour/constants'
import Content from './Content'
import HonourButton from './HonourButton'

const HonourConnector = ({ address }) => {
const [transactionSuccess, setTransactionSuccess] = useState(false)
const { data } = useContractRead(
{
addressOrName: goerli,
addressOrName: optimism,
contractInterface: abis.honour,
},
'balanceOf',
Expand Down
8 changes: 4 additions & 4 deletions src/modules/web3/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
const proposer = '0x4Daf7C338134C0Bf9aaB7C4D7dEa6e8418385c29'

// The api endpoint we're using
const apiUrl = 'https://propose.honour.community'
const apiUrl = 'https://propose.honour.community'

// The subgraph url to fetch proposalIDs from
const graphUrl =
'https://api.studio.thegraph.com/query/24825/honour-goerli/0.1.1'
const graphUrl = 'https://api.studio.thegraph.com/query/24825/honour/0.0.1'

const goerli = '0x80c25Df6014253FE78f4Ec6258F73855dEe09A6c'
const optimism = '0xB123B2d5C0932F2B13Fcf03763004f0800fF29dD'

const abi = {
honour: `[
Expand Down Expand Up @@ -342,4 +342,4 @@ const abi = {
]`,
}

export { proposer, apiUrl, graphUrl, goerli, abi }
export { proposer, apiUrl, graphUrl, goerli, optimism, abi }
4 changes: 2 additions & 2 deletions src/modules/web3/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Icon } from '@makerdao/dai-ui-icons'
import { useNotifications } from '@src/modules/notifications/context'
import { Contract } from 'ethers'
import {
goerli,
optimism,
abis,
apiUrl,
graphUrl,
Expand Down Expand Up @@ -106,7 +106,7 @@ const Web3 = ({ setIsVisible, onTransactionSuccess }) => {
setLoading(true)
const proposalId = await getProposalId()
try {
const contract = new Contract(goerli, abis.honour, signer)
const contract = new Contract(optimism, abis.honour, signer)
await contract.honour(proposer, proposalId)
setLoading(false)
onTransactionSuccess()
Expand Down
23 changes: 14 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5579,13 +5579,18 @@ dataloader@^1.4.0:
resolved "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz"
integrity sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==

date-fns@^2.14.0, date-fns@^2.30.0:
date-fns@^2.14.0:
version "2.30.0"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
dependencies:
"@babel/runtime" "^7.21.0"

date-fns@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.3.1.tgz#7581daca0892d139736697717a168afbb908cfed"
integrity sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==

debug@2, [email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
Expand Down Expand Up @@ -7830,10 +7835,10 @@ gatsby-recipes@^0.25.0:
xstate "^4.9.1"
yoga-layout-prebuilt "^1.9.6"

gatsby-remark-autolink-headers@^4.11.0:
version "4.11.0"
resolved "https://registry.yarnpkg.com/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-4.11.0.tgz#829d51672a033a765017c439ce80d991c075e7af"
integrity sha512-wklhIRpVQfv9xMPoSVKDl/DRLBzxKWr13PRQgw602zVmj/IdMzgVarJgU8aCzlyb3+JztlptnKE1U/htFs8HGQ==
gatsby-remark-autolink-headers@^4.12.0:
version "4.12.0"
resolved "https://registry.yarnpkg.com/gatsby-remark-autolink-headers/-/gatsby-remark-autolink-headers-4.12.0.tgz#cc2bc632ad2320483badee85959c0e8aa2294eb0"
integrity sha512-yqbmkB4XfB5yiDfRwnlO84HpYYHRhXmrF5R2DetbLDh/W53x2A6TpaF+V11CMpV16K2fiBxiWafcF4pgQurAwA==
dependencies:
"@babel/runtime" "^7.15.4"
github-slugger "^1.3.0"
Expand Down Expand Up @@ -8973,10 +8978,10 @@ [email protected]:
resolved "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"
integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==

immer@^10.0.2:
version "10.0.2"
resolved "https://registry.yarnpkg.com/immer/-/immer-10.0.2.tgz#11636c5b77acf529e059582d76faf338beb56141"
integrity sha512-Rx3CqeqQ19sxUtYV9CU911Vhy8/721wRFnJv3REVGWUmoAcIwzifTsdmJte/MV+0/XpM35LZdQMBGkRIoLPwQA==
immer@^10.0.3:
version "10.0.3"
resolved "https://registry.yarnpkg.com/immer/-/immer-10.0.3.tgz#a8de42065e964aa3edf6afc282dfc7f7f34ae3c9"
integrity sha512-pwupu3eWfouuaowscykeckFmVTpqbzW+rXFCX8rQLkZzM9ftBmU/++Ra+o+L27mz03zJTlyV4UUr+fdKNffo4A==

import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
version "3.3.0"
Expand Down

0 comments on commit 8071c48

Please sign in to comment.