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.

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

Feat/init marketplace #1139

Merged
merged 15 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions .github/workflows/ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,19 @@ env:
NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
NEXT_PUBLIC_SUPABASE_TABLE: ${{ vars.NEXT_PUBLIC_SUPABASE_TABLE }}
NEXT_PUBLIC_WALLETCONNECT_ID: ${{ secrets.NEXT_PUBLIC_WALLETCONNECT_ID }}
GOERLI_RPC_URL: ${{ vars.GOERLI_RPC_URL }}
MAINNET_RPC_URL: ${{ vars.MAINNET_RPC_URL }}
DOCKER_PLATFORM: "amd64"

# Trigger the workflow when:
on:
# A push occurs to one of the matched branches.
push:
branches:
- main
- develop
# Or when a pull request event occurs for a pull request against one of the
# matched branches.
pull_request:
branches:
- main
- develop
- develop-contracts
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

Expand Down
6 changes: 5 additions & 1 deletion contracts/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
MNEMONIC="test test test test test test test test test test test junk"
MNEMONIC_CELO=="test test test test test test test test test test test junk"
INFURA_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
ALCHEMY_OPTIMISM_URL="https://opt-mainnet.g.alchemy.com/v2/zzzzzzzzzzzzzzzzzzz"

# RPCs
MAINNET_RPC_URL=""
OPTIMISM_RPC_URL=""
GOERLI_RPC_URL=""

# OpenZeppelin
OPENZEPPELIN_API_KEY="zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
Expand Down
6 changes: 3 additions & 3 deletions contracts/.solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"plugins": ["prettier"],
"extends": "solhint:recommended",
"rules": {
"code-complexity": ["error", 8],
"compiler-version": ["error", "0.8.16"],
"code-complexity": ["error", 12],
"compiler-version": ["error", ">=0.8.16"],
"func-visibility": ["error", { "ignoreConstructors": true }],
"max-line-length": ["warn", 120],
"max-line-length": ["warn", 200],
"no-console": "off",
"not-rely-on-time": "off",
"reason-string": ["warn", { "maxLength": 64 }],
Expand Down
7 changes: 6 additions & 1 deletion contracts/LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
MIT License

Copyright (c) 2022 Paul Razvan Berg
Copyright (c) 2022 Paul Razvan Berg for inital template: https://github.com/paulrberg/foundry-template

Copyright (c) 2022 LooksRare for portions of marketplace: https://github.com/LooksRare/contracts-exchange-v2 commit:
7fca565

Copyright (c) 2022 Hypercerts Foundation: Hypercerts protocol and marketplace.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
Expand Down
229 changes: 0 additions & 229 deletions contracts/contracts/HypercertMinter.sol

This file was deleted.

Loading
Loading