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

Deploy-20240118 #123

Merged
merged 62 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
45d9e2b
[ci] :construction_worker: avoid push on tests error
dappsar Dec 16, 2023
fc1a7ce
Merge pull request #87 from P4-Games/feature/github-action-on-fail-test
dappsar Dec 16, 2023
2454fd2
[ci] :wastebasket: update to fail
dappsar Dec 16, 2023
652966e
Merge pull request #88 from P4-Games/feature/github-action-on-fail-test
dappsar Dec 16, 2023
ff94c1e
[ci] :construction_worker: avoid merge on tests error
dappsar Dec 16, 2023
4e19e50
[ci] :white_check_mark: restore test changed to fail
dappsar Dec 16, 2023
1be328b
Merge pull request #89 from P4-Games/feature/github-action-on-fail-test
dappsar Dec 16, 2023
1557c70
[feat] :sparkles: exchanges now accepts no wanted card and then accep…
Magehernan Dec 16, 2023
c491d62
[chore] Add one test to check revert funcionality on confirm exchange…
Magehernan Dec 18, 2023
f9b157d
[refactor] move confirm offer validation to this method and refactor …
Magehernan Dec 19, 2023
5490579
[refactor] instead of revert on remove offer, return false when offer…
Magehernan Dec 19, 2023
693f8f1
Merge pull request #90 from P4-Games/features/exchange-for-any-card
dappsar Dec 20, 2023
ae50a15
[feat] :safety_vest: add require for delete-offer in offer-exchange (…
dappsar Dec 23, 2023
a25a12a
[feat] :necktie: add event transfer-card & transfer-cards (#92)
dappsar Dec 23, 2023
aa34d23
[feat] :necktie: add event transfer-card & transfer-cards (#92)
dappsar Dec 23, 2023
4b312e6
[chore] :globe_with_meridians: translate text to english (#93)
dappsar Dec 23, 2023
c4c8891
[feat] :safety_vest: valid contract founds before transfer (#94)
dappsar Dec 23, 2023
d4dbc42
[feat] :technologist: update cards limits (#95)
dappsar Dec 23, 2023
69597f1
[refactor] :speech_balloon: put event names in past (#98)
dappsar Dec 24, 2023
0550d06
Merge pull request #97 from P4-Games/fix/contracts-validations-20231223
dappsar Dec 24, 2023
a55bfb9
[fix] :adhesive_bandage: update event name (#98)
dappsar Dec 24, 2023
52ffcaf
Merge pull request #99 from P4-Games/fix/98-event-names
dappsar Dec 24, 2023
580e3cc
[feat] :necktie: add validation in buy packs (#101)
dappsar Dec 25, 2023
12eef3c
Merge pull request #103 from P4-Games/feature/101-buy-packs-validation
dappsar Dec 25, 2023
083f8e1
[refacior] :recycle: use init method instead of the constructor (#102)
dappsar Dec 25, 2023
59d05a6
[feat] :necktie: add new ticket contract (#100)
dappsar Dec 25, 2023
0c29615
[feat] :necktie: update burn cards logic (#2)
dappsar Dec 25, 2023
bdb24ae
[refacior] :recycle: use init method instead of the constructor (#102)
dappsar Dec 25, 2023
1ac65c2
[fix] :ambulance: fix env tickets contract name
dappsar Dec 25, 2023
455c5e2
Merge pull request #105 from P4-Games/feature/contracts-logic-and-ref…
dappsar Dec 25, 2023
9d78316
[refactor] :recycle: move code to libraries (#106)
dappsar Dec 25, 2023
8a2a85e
[perf] :building_construction: reduce contracts size (#106)
dappsar Dec 25, 2023
2d85cce
[docs] :memo: document new env variables and contract addresses
dappsar Dec 25, 2023
6cdce4c
[chore] :coffin: remove dead code
dappsar Dec 25, 2023
dd12a21
[perf] _building_construction: update test (#106)
dappsar Dec 25, 2023
b7a6fd6
[fix] :adhesive_bandage: fix revert messages in tests
dappsar Dec 25, 2023
5641130
[chore] :memo: update variables order in documentation
dappsar Dec 25, 2023
fdb2108
[chore] :memo: update contracts addresses in documentation
dappsar Dec 25, 2023
b1f491c
[fix] :rewind: rever external to public in some functions (#106)
dappsar Dec 25, 2023
2e0e297
Merge pull request #107 from P4-Games/feature/106-contracts-size
dappsar Dec 25, 2023
f5392c1
[feat] x
dappsar Dec 25, 2023
94b4935
[build] :arrow_up: upgrade open-zeppelin dependency (#108)
dappsar Dec 26, 2023
315eaa7
Merge pull request #109 from P4-Games/feature/108-oz-dependency
dappsar Dec 26, 2023
6cdac70
[fix] :bug: fix pay burn-prize enter condition (#2)
dappsar Dec 27, 2023
160f06b
Merge pull request #110 from P4-Games/fix/gamma-conditions
dappsar Dec 27, 2023
69e430f
[fix] :fire: remove invalid validation (#2)
dappsar Dec 27, 2023
179cc08
Merge pull request #111 from P4-Games/fix/gamma-conditions
dappsar Dec 27, 2023
063aea6
[feat] :necktie: update secondary prize value (#112)
dappsar Dec 28, 2023
60cd043
Merge pull request #113 from P4-Games/feature/112-secondary-prize-value
dappsar Dec 28, 2023
c379164
[feat] :rewind: restore 1 DAI value for secondary album prize (#112)
dappsar Dec 29, 2023
59dda48
Merge pull request #114 from P4-Games/feature/112-secondary-prize-value
dappsar Dec 29, 2023
86773c9
[feat] :safety_vest: check if user has enough copies to burn with off…
dappsar Dec 29, 2023
ed03e47
Merge pull request #116 from P4-Games/feature/115-burn-with-offer
dappsar Dec 29, 2023
66b0bde
[fix] :adhesive_bandage: corrected user address in buy packs
dappsar Dec 29, 2023
3e1c6cf
[refactor] :recycle: reduce amma cards contract size (#106)
dappsar Dec 29, 2023
ba7b4c2
Merge pull request #117 from P4-Games/fix/buy_packs_user
dappsar Dec 29, 2023
e1615e0
Merge pull request #118 from P4-Games/fix/gamma-size
dappsar Dec 29, 2023
677120d
[docs] :memo: update contract addresses
dappsar Dec 31, 2023
4cfab20
[chore] :truck: rename support scripts files
dappsar Dec 31, 2023
c752756
[chore] :truck: rename support scripts files
dappsar Dec 31, 2023
2f45e4f
[build] :memo: update contracts addresses and add gamma cards NFT to …
dappsar Dec 31, 2023
920c50a
Merge pull request #122 from P4-Games/fix/fix-202312
dappsar Jan 1, 2024
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
13 changes: 12 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -21,4 +25,11 @@ jobs:
- name: Test deploy harhat
run: npx hardhat node & npx hardhat run --network hardhat scripts/deploy.ts
- name: Run tests
run: npx hardhat test
run: npx hardhat test
block-on-failure:
needs: build
runs-on: ubuntu-latest
if: ${{ failure() }}
steps:
- name: Block push on failure
run: exit 1
23 changes: 16 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,14 @@ ADDITIONAL_OWNERS_WALLETS_ADDRESSES=''
# (it will use the ones defined in these variables)
NOF_DAI_CONTRACT_CURRENT_ADDRESS=''
NOF_ALPHA_CONTRACT_CURRENT_ADDRESS=''
NOF_GAMMA_PACKS_CONTRACT_CURRENT_ADDRESS=''
NOF_GAMMA_CARDS_CONTRACT_CURRENT_ADDRESS=''
NOF_GAMMA_PACKS_CONTRACT_CURRENT_ADDRESS=''
NOF_GAMMA_OFFERS_CONTRACT_CURRENT_ADDRESS=''
NOF_GAMMA_LIB_PACK_VERIFIER_CONTRACT_NAME=''
NOF_GAMMA_LIB_STRING_UTILS_CONTRACT_NAME=''
NOF_GAMMA_LIB_OWNERS_MGMT_CONTRACT_NAME=''

# Addresses to mint DAIs using a script (scripts/mint-dais.ts)
# Addresses to mint DAIs using a script (scripts/support-mint-dais.ts)
NOF_DAI_MINT_EXTRA_WALLET_ADDRESSES=''

# Just a flag to enable ('1') print to console or not ('0' - default -)
Expand All @@ -113,11 +116,15 @@ npx hardhat compile
npx hardhat test

# Deploy to local
npx hardhat run scripts/deploy.ts --network localhost
npx hardhat run scripts/deploy.ts

# Deploy to Mumnbai
npx hardhat run scripts/deploy.ts --network mumbai

# Deploy Mock Data (local)
npx hardhat run scripts/deploy-mock-data.ts


# Solidity Security and Style guides validations with solhint [https://protofire.github.io/solhint/]
npm install -g solhint
solhint 'contracts/**/*.sol'
Expand All @@ -136,10 +143,12 @@ See detaills about gamma Smart Contracts in this [file](./.doc/contracts-info.md

### Mumbai
* DAI: 0xEa4c35c858E15Cef77821278A88435dE57bc8707
* Alpha: 0x37Ee2C0768c047A3b4892613007b3eaE217411f4
* Gamma Packs: 0x1F69307e85463fd0Fe2Db048Be932BE5f263d485
* Gamma Cards: 0xa58eF78A16b7c6300DdaE0e26e96AcaF2eC39b4f
* Gamma Offers: 0xD46EC7D15B9cd30C86668200cC9f7307E2aB9331
* Alpha: 0x7C201e88e43b5FBEEfB77F966c2a5D2E09178B49
* Gamma Cards: 0x34658c07F05638E12793d0961595cBc72fA69452
* Gamma Cards NFT: 0x1b3aeb1652bf9a9ab269fa987feec34a65ef7b69
* Gamma Packs: 0xDc06FbD70b2159863d079aE282d69AEe8a88A18E
* Gamma Offers: 0x3Da346C40A0D90cf5642944613586439A3456d45
* Gamma Tickets: 0x7593aad3e13fBd27F113aad8688E8817Ac4f9A33

### Mainet

Expand Down
292 changes: 0 additions & 292 deletions contracts/_deprecated/Alpha.v2__

This file was deleted.

Loading