Skip to content

Commit f8a83c7

Browse files
authored
Merge branch 'ethereum:dev' into dev
2 parents e00a7c1 + 85738a1 commit f8a83c7

File tree

10 files changed

+14
-37
lines changed

10 files changed

+14
-37
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ To use an existing function locally you don't need to do anything. Just check th
122122
To create a new function, you will need to create two files:
123123

124124
- One in `src/lambda` where the logic will live. These are the ones that will be deployed to Netlify. These functions follow [this format](https://docs.netlify.com/functions/build-with-javascript/#synchronous-function-format).
125-
- One in `src/api` that will be just a wrapper around the previous one in order to be compatible with Gatsby functions. More on the [Gatbsy docs](https://www.gatsbyjs.com/docs/reference/functions/getting-started/) for the format they follow.
125+
- One in `src/api` that will be just a wrapper around the previous one in order to be compatible with Gatsby functions. More on the [Gatsby docs](https://www.gatsbyjs.com/docs/reference/functions/getting-started/) for the format they follow.
126126

127127
Typically, you will develop and test functions in the Gatsby context, by running `yarn start`.
128128

src/@chakra-ui/gatsby-plugin/semanticTokens.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ const semanticTokens = {
9292
_dark: "whiteAlpha.400",
9393
},
9494
switchBackground: { _light: "gray.300", _dark: "whiteAlpha.400" },
95+
hubHeroContentBg: {
96+
_light: "rgba(255, 255, 255, 0.80)",
97+
_dark: "rgba(34, 34, 34, 0.80)",
98+
},
9599
},
96100
gradients: {
97101
bgMainGradient: {

src/components/Hero/HubHero/index.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
import * as React from "react"
2-
import {
3-
Box,
4-
Heading,
5-
HStack,
6-
Stack,
7-
Text,
8-
useColorModeValue,
9-
} from "@chakra-ui/react"
2+
import { Box, Heading, HStack, Stack, Text } from "@chakra-ui/react"
103
import GatsbyImage from "../../GatsbyImage"
114
import { CallToAction } from "../CallToAction"
125
import { CommonHeroProps } from "../utils"
@@ -22,11 +15,6 @@ const HubHero = (props: HubHeroProps) => {
2215
)
2316
}
2417

25-
const largeContentBg = useColorModeValue(
26-
"rgba(255, 255, 255, 0.80)",
27-
"rgba(34, 34, 34, 0.80)"
28-
)
29-
3018
return (
3119
<Box position="relative">
3220
<GatsbyImage
@@ -47,7 +35,7 @@ const HubHero = (props: HubHeroProps) => {
4735
p={{ base: "4", lg: "8" }}
4836
textAlign={{ base: "center", xl: "start" }}
4937
borderRadius={{ xl: "base" }}
50-
bg={{ xl: largeContentBg }}
38+
bg={{ xl: "hubHeroContentBg" }}
5139
position={{ xl: "absolute" }}
5240
insetStart={{ xl: "8" }}
5341
maxW={{ xl: "sm" }}

src/content/developers/docs/programming-languages/rust/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Need a more basic primer first? Check out [ethereum.org/learn](/learn/) or [ethe
3535
- [Build A Decentralized Chat Using JavaScript and Rust](https://medium.com/perlin-network/build-a-decentralized-chat-using-javascript-rust-webassembly-c775f8484b52)
3636
- [Build a Decentralized Todo App Using Vue.js & Rust](https://medium.com/@jjmace01/build-a-decentralized-todo-app-using-vue-js-rust-webassembly-5381a1895beb)
3737

38-
- [An Intro to Secret Contracts](https://blog.enigma.co/getting-started-with-enigma-an-intro-to-secret-contracts-cdba4fe501c2)
3938
- [Build a blockchain in Rust](https://blog.logrocket.com/how-to-build-a-blockchain-in-rust/)
4039

4140
## Rust projects and tools {#rust-projects-and-tools}

src/content/developers/docs/scaling/zk-rollups/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Before accepting transactions, the operator will perform the usual checks. This
117117

118118
Once the ZK-rollup node has enough transactions, it aggregates them into a batch and compiles inputs for the proving circuit to compile into a succinct ZK-proof. This includes:
119119

120-
- A Merkle tree comprising all the transactions in the batch.
120+
- A Merkle tree root comprising all the transactions in the batch.
121121
- Merkle proofs for transactions to prove inclusion in the batch.
122122
- Merkle proofs for each sender-receiver pair in transactions to prove those accounts are part of the rollup's state tree.
123123
- A set of intermediate state roots, derived from updating the state root after applying state updates for each transaction (i.e., decreasing sender accounts and increasing receiver accounts).

src/content/developers/tutorials/how-to-use-echidna-to-test-smart-contracts/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Echidna is a property-based fuzzer, we described in our previous blogposts ([1](
4040

4141
### Fuzzing {#fuzzing}
4242

43-
[Fuzzing](https://wikipedia.org/wiki/Fuzzing) is a well-known technique in the security community. It consists to generate more or less randomly inputs to find bugs in the program. Fuzzers for traditional software (such as [AFL](http://lcamtuf.coredump.cx/afl/) or [LibFuzzer](https://llvm.org/docs/LibFuzzer.html)) are known to be efficient tools to find bugs.
43+
[Fuzzing](https://wikipedia.org/wiki/Fuzzing) is a well-known technique in the security community. It consists of generating inputs that are more or less random to find bugs in the program. Fuzzers for traditional software (such as [AFL](http://lcamtuf.coredump.cx/afl/) or [LibFuzzer](https://llvm.org/docs/LibFuzzer.html)) are known to be efficient tools to find bugs.
4444

4545
Beyond the purely random generation of inputs, there are many techniques and strategies to generate good inputs, including:
4646

src/content/developers/tutorials/how-to-view-nft-in-metamask/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: How to View Your NFT in Your Wallet (Part 3/3 of NFT Tutorial Series)
3-
description: This tutorial describes how to view an existing an NFT on MetaMask!
3+
description: This tutorial describes how to view an existing NFT on MetaMask!
44
author: "Sumi Mudgil"
55
tags: ["ERC-721", "Alchemy", "Solidity"]
66
skill: beginner

src/content/developers/tutorials/learn-foundational-ethereum-topics-with-sql/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ source: paulapivat.com
1010
sourceUrl: https://paulapivat.com/post/query_ethereum/
1111
---
1212

13-
Many Ethereum tutorials target developers, but there’s a lack of educational resources for data analyst or for people who wish to see on-chain data without running a client or node.
13+
Many Ethereum tutorials target developers, but there’s a lack of educational resources for data analysts or for people who wish to see on-chain data without running a client or node.
1414

1515
This tutorial helps readers understand fundamental Ethereum concepts including transactions, blocks and gas by querying on-chain data with structured query language (SQL) through an interface provided by [Dune Analytics](https://dune.xyz/home).
1616

@@ -26,7 +26,7 @@ However, a user may wish to query the data directly to reconcile the information
2626

2727
For reference, the smart contract account for the Ethereum Foundation (EF) can be viewed on [Etherscan](https://etherscan.io/address/0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae).
2828

29-
One thing to note is that all accounts, including the EF’s, has a public address that can be used to send and receive transactions.
29+
One thing to note is that all accounts, including the EF’s, have a public address that can be used to send and receive transactions.
3030

3131
The account balance on Etherscan comprises regular transactions and internal transactions. Internal transactions, despite the name, are not _actual_ transactions that change the state of the chain. They are value transfers initiated by executing a contract ([source](https://ethereum.stackexchange.com/questions/3417/how-to-get-contract-internal-transactions)). Since internal transactions have no signature, they are **not** included on the blockchain and cannot be queried with Dune Analytics.
3232

src/content/developers/tutorials/reverse-engineering-a-contract/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ If the call data size is four bytes or more this might be a valid ABI call.
274274
| 10 | PUSH1 0xe0 | 0xE0 (((First word (256 bits) of the call data))) |
275275
| 12 | SHR | (((first 32 bits (4 bytes) of the call data))) |
276276

277-
Etherscan tells us that `1C` is an unknown opcode, because [it was added after Etherscan wrote this feature](https://eips.ethereum.org/EIPS/eip-145) and they haven't updated it. An [up to data opcode table](https://github.com/wolflo/evm-opcodes) shows us that this is shift right
277+
Etherscan tells us that `1C` is an unknown opcode, because [it was added after Etherscan wrote this feature](https://eips.ethereum.org/EIPS/eip-145) and they haven't updated it. An [up to date opcode table](https://github.com/wolflo/evm-opcodes) shows us that this is shift right
278278

279279
| Offset | Opcode | Stack |
280280
| -----: | ---------------- | -------------------------------------------------------------------------------------------------------- |

yarn.lock

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16641,21 +16641,7 @@ shallow-compare@^1.2.2:
1664116641
resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb"
1664216642
integrity sha512-LUMFi+RppPlrHzbqmFnINTrazo0lPNwhcgzuAXVVcfy/mqPDrQmHAyz5bvV0gDAuRFrk804V0HpQ6u9sZ0tBeg==
1664316643

16644-
sharp@^0.32.1:
16645-
version "0.32.4"
16646-
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.4.tgz#0354653b7924f2520b2264ac9bcd10a58bf411b6"
16647-
integrity sha512-exUnZewqVZC6UXqXuQ8fyJJv0M968feBi04jb9GcUHrWtkRoAKnbJt8IfwT4NJs7FskArbJ14JAFGVuooszoGg==
16648-
dependencies:
16649-
color "^4.2.3"
16650-
detect-libc "^2.0.2"
16651-
node-addon-api "^6.1.0"
16652-
prebuild-install "^7.1.1"
16653-
semver "^7.5.4"
16654-
simple-get "^4.0.1"
16655-
tar-fs "^3.0.4"
16656-
tunnel-agent "^0.6.0"
16657-
16658-
sharp@^0.32.6:
16644+
sharp@^0.32.1, sharp@^0.32.6:
1665916645
version "0.32.6"
1666016646
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
1666116647
integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==

0 commit comments

Comments
 (0)