Skip to content

Commit e72282a

Browse files
committed
Merge branch 'master' of https://github.com/0xcert/ethereum-erc721 into test-extcodehash
2 parents 93858c0 + 8ecfc29 commit e72282a

27 files changed

+9687
-1471
lines changed

.github/workflows/node.js.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Node.js CI
5+
6+
on: push
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
node-version: [12, 14] # https://nodejs.org/en/about/releases/
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Use Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v2
18+
with:
19+
node-version: ${{ matrix.node-version }}
20+
- run: |
21+
npm ci
22+
npm run solhint && npm test

.travis.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

BUG_BOUNTY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The leaderboard will list all the contributors to this bounty.
1414

1515
**Sponsor this bug bounty if you support ERC-721**. This means you will commit to paying researchers that demonstrate a problem. Contact us at [[email protected]](mailto:[email protected]) if interested. Thank you.
1616

17-
[![0xcert](https://img.shields.io/badge/0xcert-10%20ETH-red.svg)](https://0xcert.org) [![William Entriken](https://img.shields.io/badge/William%20Entriken-2%20ETH-red.svg)](https://github.com/fulldecent) [![ERC-721 Bug Bounty Budget](https://img.shields.io/badge/ERC--721%20Bug%20Bounty%20Budget-12%20ETH-purple.svg)](https://etherscan.io/address/0xa2c60e9E1f6e6B2C16a6B8ECf3BdDAEf015C572b)
17+
[![0xcert](https://img.shields.io/badge/0xcert-1%20ETH-red.svg)](https://0xcert.org) [![William Entriken](https://img.shields.io/badge/William%20Entriken-1%20ETH-red.svg)](https://github.com/fulldecent) [![ERC-721 Bug Bounty Budget](https://img.shields.io/badge/ERC--721%20Bug%20Bounty%20Budget-2%20ETH-purple.svg)](https://etherscan.io/address/0xa2c60e9E1f6e6B2C16a6B8ECf3BdDAEf015C572b)
1818

1919
Become a sponsor and be listed here as a contributor to the bug bounty fund: `0xa2c60e9E1f6e6B2C16a6B8ECf3BdDAEf015C572b`.
2020

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ There are also test mocks that can be seen [here](src/tests/mocks). These are sp
2424

2525
## Requirements
2626

27-
* NodeJS 9.0+ is supported
27+
* NodeJS 12+ is supported
2828
* Windows, Linux or macOS
2929

3030
## Installation
@@ -77,7 +77,7 @@ You have created and have possession of unique glass-blown artwork (each having
7777
To do this, simply paste the code below into Remix and deploy the smart contract. You will "mint" a token for each new piece of artwork you want to see. Then you will "burn" that token when you surrender physical possession of the piece.
7878

7979
```solidity
80-
pragma solidity 0.8.0;
80+
pragma solidity 0.8.6;
8181
8282
import "https://github.com/0xcert/ethereum-erc721/src/contracts/tokens/nf-token-metadata.sol";
8383
import "https://github.com/0xcert/ethereum-erc721/src/contracts/ownership/ownable.sol";

0 commit comments

Comments
 (0)