Skip to content

Commit

Permalink
Merge pull request #67 from provable-things/remove-all-erc777-hooks
Browse files Browse the repository at this point in the history
feat(ptoken): <- remove all ERC777 hooks from that
  • Loading branch information
gskapka authored Dec 16, 2022
2 parents 0186697 + 78a6219 commit a271df9
Show file tree
Hide file tree
Showing 14 changed files with 1,870 additions and 968 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Create pre-release"

on:
create:
tags:

jobs:
create_prerelease:
runs-on: "ubuntu-latest"
steps:
- uses: "marvinpinto/[email protected]"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: true
15 changes: 15 additions & 0 deletions .github/workflows/create-tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Create Tag

on:
push:
branches: [ master ]

jobs:
create_tag:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: Klemensas/action-autotag@stable
with:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
tag_prefix: "v"
37 changes: 37 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Node.js CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
with:
persist-credentials: 'false'
fetch-depth: '0'

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: ./package-lock.json
- run: git config --global url."https://${{ secrets.PROVABLE_MACHINE_GENERAL_PAT }}@github.com/".insteadOf ssh://[email protected]/
- run: npm ci

- name: Run linter
run: npm run lint

- name: Run tests
run: npm run tests
2 changes: 1 addition & 1 deletion contracts/ERC777GSN.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pragma solidity ^0.6.2;
import "@openzeppelin/contracts-upgradeable/proxy/Initializable.sol";
import "@openzeppelin/contracts-upgradeable/cryptography/ECDSAUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/GSN/GSNRecipientUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/token/ERC777/ERC777Upgradeable.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "./ERC777Upgradeable.sol";

contract ERC777GSNUpgradeable is Initializable, OwnableUpgradeable, GSNRecipientUpgradeable, ERC777Upgradeable {
using ECDSAUpgradeable for bytes32;
Expand Down
Loading

0 comments on commit a271df9

Please sign in to comment.