Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.

Commit 4424324

Browse files
dekzdekz
authored
Merge pull request #438 from 0xProject/feat/zeip-93
ZEIP-93
2 parents 318c074 + ffbbf59 commit 4424324

File tree

4 files changed

+117
-59
lines changed

4 files changed

+117
-59
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 70 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,73 @@ name: build and test
33
on: [push]
44

55
jobs:
6-
install-dependencies:
7-
runs-on: ubuntu-latest
8-
env:
9-
CI: true
10-
steps:
11-
- uses: actions/checkout@v2
12-
- run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
13-
- run: yarn install --frozen-lockfile --check-files
14-
- uses: actions/cache@v1
15-
id: cache-deps
16-
with:
17-
token: ${{ github.token }}
18-
path: '.'
19-
key: ${{ github.sha }}-deps
20-
lint:
21-
runs-on: ubuntu-latest
22-
needs: install-dependencies
23-
steps:
24-
- uses: actions/cache@v1
25-
id: restore-deps
26-
with:
27-
path: '.'
28-
key: ${{ github.sha }}-deps
29-
- run: yarn lint
30-
unit-test:
31-
runs-on: ubuntu-latest
32-
needs: install-dependencies
33-
steps:
34-
- uses: actions/cache@v1
35-
id: restore-deps
36-
with:
37-
path: '.'
38-
key: ${{ github.sha }}-deps
39-
- run: yarn test
40-
build:
41-
runs-on: ubuntu-latest
42-
needs: install-dependencies
43-
strategy:
44-
matrix:
45-
node-version: [12.x]
46-
steps:
47-
- uses: actions/cache@v1
48-
id: restore-deps
49-
with:
50-
path: '.'
51-
key: ${{ github.sha }}
52-
- name: Use Node.js ${{ matrix.node-version }}
53-
uses: actions/setup-node@v1
54-
with:
55-
node-version: ${{ matrix.node-version }}
56-
# HACK(johnrjj) - Rebuild node-sass in case build step runs on a separate machine than the dependency install
57-
- run: npm rebuild node-sass
58-
- run: yarn build:prod
59-
- uses: actions/cache@v1
60-
id: cache-build
61-
with:
62-
path: '.'
63-
key: ${{ github.sha }}-build
6+
install-dependencies:
7+
runs-on: ubuntu-latest
8+
env:
9+
CI: true
10+
steps:
11+
- uses: actions/checkout@v2
12+
- run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
13+
- name: Setup node 12
14+
uses: actions/setup-node@v1
15+
with:
16+
node-version: 12.x
17+
- run: yarn install --frozen-lockfile --check-files
18+
- uses: actions/cache@v1
19+
id: cache-deps
20+
with:
21+
token: ${{ github.token }}
22+
path: '.'
23+
key: ${{ github.sha }}-deps
24+
lint:
25+
runs-on: ubuntu-latest
26+
needs: install-dependencies
27+
steps:
28+
- uses: actions/cache@v1
29+
id: restore-deps
30+
with:
31+
path: '.'
32+
key: ${{ github.sha }}-deps
33+
- name: Setup node 12
34+
uses: actions/setup-node@v1
35+
with:
36+
node-version: 12.x
37+
- run: yarn lint
38+
unit-test:
39+
runs-on: ubuntu-latest
40+
needs: install-dependencies
41+
steps:
42+
- uses: actions/cache@v1
43+
id: restore-deps
44+
with:
45+
path: '.'
46+
key: ${{ github.sha }}-deps
47+
- name: Setup node 12
48+
uses: actions/setup-node@v1
49+
with:
50+
node-version: 12.x
51+
- run: yarn test
52+
build:
53+
runs-on: ubuntu-latest
54+
needs: install-dependencies
55+
strategy:
56+
matrix:
57+
node-version: [12.x]
58+
steps:
59+
- uses: actions/cache@v1
60+
id: restore-deps
61+
with:
62+
path: '.'
63+
key: ${{ github.sha }}
64+
- name: Use Node.js ${{ matrix.node-version }}
65+
uses: actions/setup-node@v1
66+
with:
67+
node-version: ${{ matrix.node-version }}
68+
# HACK(johnrjj) - Rebuild node-sass in case build step runs on a separate machine than the dependency install
69+
- run: npm rebuild node-sass
70+
- run: yarn build:prod
71+
- uses: actions/cache@v1
72+
id: cache-build
73+
with:
74+
path: '.'
75+
key: ${{ github.sha }}-build

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@0x/website",
33
"version": "0.0.89",
44
"engines": {
5-
"node": ">=6.12"
5+
"node": ">=12 <13"
66
},
77
"private": true,
88
"description": "Website and 0x portal dapp",

‎ts/components/sections/landing/hero.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const AnimatedHeroTitle: React.FC<{}> = () => {
5252
{ label: 'Avalanche', color: '#FF3500' },
5353
{ label: 'Fantom', color: '#a2f5eb' },
5454
{ label: 'Celo', color: '#14b094' },
55+
{ label: 'Optimism', color: '#FF3500' },
5556
];
5657

5758
const transitions = useTransition(index, {

‎ts/pages/governance/data.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,48 @@ export const proposals: Proposals = {
634634
],
635635
},
636636
},
637+
93: {
638+
zeipId: 93,
639+
title: 'NFT Orders',
640+
summary: [
641+
`This ZEIP proposes to add NFT orders to the 0x V4 protocol. Users can now trade ERC-721 and ERC-1155 assets on all the networks 0x supports.`,
642+
`NFT orders have been built to be up to 54% cheaper than other alternatives.`,
643+
`Property based orders are supported, enabling traders to create floor bids for any asset.`,
644+
],
645+
url: 'https://github.com/0xProject/ZEIPs/issues/93',
646+
voteStartDate: moment(1644858000, 'X'),
647+
voteEndDate: moment(1645117200, 'X'),
648+
benefit: {
649+
title: 'Benefit',
650+
summary: [
651+
`Allow users to trade ERC-721 and ERC-1155 assets on all the networks 0x supports.`,
652+
`Up to 54% cheaper than other alternatives.`,
653+
`Instant royalties for creators.`,
654+
],
655+
rating: 5,
656+
links: [
657+
{
658+
text: 'Launch Announcement',
659+
url: 'https://blog.0x.org/introducing-multi-chain-nft-swaps/',
660+
},
661+
],
662+
},
663+
risks: {
664+
title: 'Risk',
665+
summary: [
666+
`Contracts were thoroughly reviewed internally and audited by ABDK. No vulnerabilities were found.`,
667+
`However, these changes do modify a risk-sensitive part of the codebase: the execution within a privileged environment.`,
668+
`0x V4 architecture comes with the ability to modify or rollback specific features, without halting the entire pipeline of smart contracts. This means that if a vulnerability is found (0x Labs offers generous bug bounties), it is possible to rollback the functionality that exposes the risk.`,
669+
],
670+
rating: 1,
671+
links: [
672+
{
673+
text: '0x v4 Bug Bounty',
674+
url: 'https://protocol.0x.org/en/latest/additional/bounties.html',
675+
},
676+
],
677+
},
678+
},
637679
};
638680

639681
export const stagingProposals: Proposals = {
@@ -667,6 +709,9 @@ export const stagingProposals: Proposals = {
667709
91: {
668710
...proposals[91],
669711
},
712+
93: {
713+
...proposals[93],
714+
},
670715
};
671716

672717
export const ZERO_TALLY: TallyInterface = {

0 commit comments

Comments
 (0)