Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Bump rakefile deps #6813

Merged
merged 1 commit into from
Jun 24, 2023
Merged

CI: Bump rakefile deps #6813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
uses: actions/checkout@47fbe2df0ad0e27efb67a70beac3555f192b062f

- name: Install Ruby
uses: ruby/setup-ruby@08245253a76fa4d1e459b7809579c62bd9eb718a
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf
with:
ruby-version: 2.6.0
ruby-version: 3.1.4 # 3.2 fails, see https://github.com/github/pages-gem/issues/879
bundler-cache: true

- name: Build Website
Expand All @@ -56,8 +56,7 @@ jobs:
bundle exec jekyll build

- name: HTML Proofer
run: bundle exec htmlproofer ./_site --check-html --check-opengraph --report-missing-names --log-level=:debug --assume-extension --empty-alt-ignore --timeframe=6w --disable-external

run: bundle exec htmlproofer --allow-missing-href --disable-external --assume-extension '.html' --log-level=:info --cache='{"timeframe":{"external":"6w"}}' --checks 'Links,Images,Scripts,OpenGraph' --no-check-sri --ignore-empty-alt --no-enforce_https ./_site
- name: DNS Validator
run: bundle exec github-pages health-check

Expand Down
8 changes: 4 additions & 4 deletions EIPS/eip-2535.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ created: 2020-02-22

## Abstract

<img align="right" src="../assets/eip-2535/diamond.svg" width="230" height="230">
<img align="right" src="../assets/eip-2535/diamond.svg" width="230" height="230" alt="Diamonds contract structure">

This proposal standardizes diamonds, which are modular smart contract systems that can be upgraded/extended after deployment, and have virtually no size limit. More technically, a **diamond** is a contract with external functions that are supplied by contracts called **facets**. Facets are separate, independent contracts that can share internal functions, libraries, and state variables.

Expand All @@ -38,7 +38,7 @@ The diagram below shows two diamonds using the same two facets.
- `FacetB` is used by `Diamond1`
- `FacetB` is used by `Diamond2`

<img src="../assets/eip-2535/facetreuse.png">
<img src="../assets/eip-2535/facetreuse.png" alt="Facet reuse">

### Upgradeable Diamond vs. Centralized Private Database

Expand Down Expand Up @@ -140,7 +140,7 @@ fallback() external payable {

This diagram shows the structure of a diamond:

<img src="../assets/eip-2535/DiamondDiagram.png">
<img src="../assets/eip-2535/DiamondDiagram.png" alt="Mapping facets and storage">

### Storage

Expand All @@ -160,7 +160,7 @@ In this diagram
- `FacetA` and `FacetB` share access to `DataAB`.
- The diamond's own code, `FacetA` and `FacetB` share access to `DataABD`.

<img src="../assets/eip-2535/diamondstorage1.png">
<img src="../assets/eip-2535/diamondstorage1.png" alt="Mapping code, data, and facets">

### Solidity Libraries as Facets

Expand Down
9 changes: 5 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ gem "minima", "~> 2.0"

# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.11"
gem "github-pages", "206"
gem "github-pages", "228"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?
gem "wdm", "~> 0.1.1" if Gem.win_platform?

gem "html-proofer", '>=3.3.1'
gem "html-proofer", '>=5.0.7'

gem "eip_validator", ">=0.8.2"

gem "webrick", "~> 1.8" # needed for macOS builds
Loading