diff --git a/genesis-state.json b/genesis-state.json index 444bb48..423bfc7 100644 --- a/genesis-state.json +++ b/genesis-state.json @@ -10,401 +10,417 @@ }, "matches": [], "teams": [ - { - "id": 1, - "name": "CryptoKickers" - }, - { - "id": 2, - "name": "StarKick" - }, - { - "id": 3, - "name": "Movement" - }, - { - "id": 4, - "name": "PizzaPasta FC" - }, - { - "id": 5, - "name": "Decentralize Feet" - }, - { - "id": 6, - "name": "Avail" - }, - { - "id": 7, - "name": "BTC-R7" - }, - { - "id": 8, - "name": "Dabl Club" - }, - { - "id": 9, - "name": "UpOnly FC" - }, - { - "id": 10, - "name": "Whitehats FC" - }, - { - "id": 11, - "name": "Her DAO" - }, - { - "id": 12, - "name": "Los Borbotones" - } + { + "id": 1, + "name": "CryptoKickers" + }, + { + "id": 2, + "name": "StarKick" + }, + { + "id": 3, + "name": "Movement" + }, + { + "id": 4, + "name": "PizzaPasta FC" + }, + { + "id": 5, + "name": "Decentralize Feet" + }, + { + "id": 6, + "name": "Avail" + }, + { + "id": 7, + "name": "BTC-R7" + }, + { + "id": 8, + "name": "Dabl Club" + }, + { + "id": 9, + "name": "UpOnly FC" + }, + { + "id": 10, + "name": "Whitehats FC" + }, + { + "id": 11, + "name": "Her DAO" + }, + { + "id": 12, + "name": "Los Borbotones" + } ], "players": [ - {"id": 1, "name": "Alisson Becker", "teamId": 1}, - {"id": 2, "name": "Caoimhin Kelleher", "teamId": 1}, - {"id": 3, "name": "Adrián", "teamId": 1}, - {"id": 4, "name": "Virgil van Dijk", "teamId": 1}, - { - "id": 5, - "name": "Ibrahima Konaté", - "teamId": 2 - }, - { - "id": 6, - "name": "Joe Gomez", - "teamId": 2 - }, - { - "id": 7, - "name": "Joël Matip", - "teamId": 2 - }, - { - "id": 8, - "name": "Andrew Robertson", - "teamId": 2 - }, - { - "id": 9, - "name": "Trent Alexander-Arnold", - "teamId": 2 - }, - { - "id": 10, - "name": "Kostas Tsimikas", - "teamId": 3 - }, - { - "id": 11, - "name": "Curtis Jones", - "teamId": 3 - }, - { - "id": 12, - "name": "David de Gea", - "teamId": 3 - }, - { - "id": 13, - "name": "Dean Henderson", - "teamId": 3 - }, - { - "id": 14, - "name": "Tom Heaton", - "teamId": 3 - }, - { - "id": 15, - "name": "Harry Maguire", - "teamId": 3 - }, - { - "id": 16, - "name": "Raphaël Varane", - "teamId": 3 - }, - { - "id": 17, - "name": "Victor Lindelöf", - "teamId": 4 - }, - { - "id": 18, - "name": "Luke Shaw", - "teamId": 4 - }, - { - "id": 19, - "name": "Aaron Wan-Bissaka", - "teamId": 4 - }, - { - "id": 20, - "name": "Alex Telles", - "teamId": 4 - }, - { - "id": 21, - "name": "Scott McTominay", - "teamId": 4 - }, - { - "id": 22, - "name": "Fred", - "teamId": 4 - }, - { - "id": 23, - "name": "Édouard Mendy", - "teamId": 5 - }, - { - "id": 24, - "name": "Kepa Arrizabalaga", - "teamId": 5 - }, - { - "id": 25, - "name": "Marcus Bettinelli", - "teamId": 5 - }, - { - "id": 26, - "name": "Thiago Silva", - "teamId": 5 - }, - { - "id": 27, - "name": "César Azpilicueta", - "teamId": 5 - }, - { - "id": 28, - "name": "Reece James", - "teamId": 6 - }, - { - "id": 29, - "name": "Ben Chilwell", - "teamId": 6 - }, - { - "id": 30, - "name": "Antonio Rüdiger", - "teamId": 6 - }, - { - "id": 31, - "name": "N'Golo Kanté", - "teamId": 6 - }, - { - "id": 32, - "name": "Jorginho", - "teamId": 6 - }, - { - "id": 33, - "name": "Mason Mount", - "teamId": 7 - }, - { - "id": 34, - "name": "Aaron Ramsdale", - "teamId": 7 - }, - { - "id": 35, - "name": "Matt Turner", - "teamId": 7 - }, - { - "id": 36, - "name": "William Saliba", - "teamId": 7 - }, - { - "id": 37, - "name": "Ben White", - "teamId": 7 - }, - { - "id": 38, - "name": "Gabriel Magalhães", - "teamId": 7 - }, - { - "id": 39, - "name": "Kieran Tierney", - "teamId": 7 - }, - { - "id": 40, - "name": "Takehiro Tomiyasu", - "teamId": 8 - }, - { - "id": 41, - "name": "Granit Xhaka", - "teamId": 8 - }, - { - "id": 42, - "name": "Thomas Partey", - "teamId": 8 - }, - { - "id": 43, - "name": "Martin Ødegaard", - "teamId": 8 - }, - { - "id": 44, - "name": "Bukayo Saka", - "teamId": 8 - }, - { - "id": 45, - "name": "Ederson", - "teamId": 8 - }, - { - "id": 46, - "name": "Stefan Ortega", - "teamId": 9 - }, - { - "id": 47, - "name": "Rúben Dias", - "teamId": 9 - }, - { - "id": 48, - "name": "Aymeric Laporte", - "teamId": 9 - }, - { - "id": 49, - "name": "John Stones", - "teamId": 9 - }, - { - "id": 50, - "name": "Kyle Walker", - "teamId": 9 - }, - { - "id": 51, - "name": "João Cancelo", - "teamId": 9 - }, - { - "id": 52, - "name": "Rodri", - "teamId": 10 - }, - { - "id": 53, - "name": "Kevin De Bruyne", - "teamId": 10 - }, - { - "id": 54, - "name": "Bernardo Silva", - "teamId": 10 - }, - { - "id": 55, - "name": "Phil Foden", - "teamId": 10 - }, - { - "id": 56, - "name": "Hugo Lloris", - "teamId": 10 - }, - { - "id": 57, - "name": "Fraser Forster", - "teamId": 10 - }, - { - "id": 58, - "name": "Cristian Romero", - "teamId": 10 - }, - { - "id": 59, - "name": "Eric Dier", - "teamId": 11 - }, - { - "id": 60, - "name": "Davinson Sánchez", - "teamId": 11 - }, - { - "id": 61, - "name": "Ben Davies", - "teamId": 11 - }, - { - "id": 62, - "name": "Emerson Royal", - "teamId": 11 - }, - { - "id": 63, - "name": "Pierre-Emile Højbjerg", - "teamId": 11 - }, - { - "id": 64, - "name": "Rodrigo Bentancur", - "teamId": 11 - }, - { - "id": 65, - "name": "Heung-min Son", - "teamId": 11 - }, - { - "id": 66, - "name": "Harry Kane", - "teamId": 12 - }, - { - "id": 67, - "name": "Lucas Moura", - "teamId": 12 - }, - { - "id": 68, - "name": "Steven Bergwijn", - "teamId": 12 - }, - { - "id": 69, - "name": "Bryan Gil", - "teamId": 12 - }, - { - "id": 70, - "name": "Dele Alli", - "teamId": 12 - }, - { - "id": 71, - "name": "Giovani Lo Celso", - "teamId": 12 - }, - { - "id": 72, - "name": "Tanguy Ndombele", - "teamId": 12 - } + { + "id": 1, + "name": "Yash Saraswat", + "teamId": 1 + }, + { + "id": 2, + "name": "Harpalsinh Jadeja", + "teamId": 1 + }, + { + "id": 3, + "name": "Pawan Bajaj", + "teamId": 1 + }, + { + "id": 4, + "name": "supernova", + "teamId": 1 + }, + { + "id": 5, + "name": "Matias", + "teamId": 1 + }, + { + "id": 6, + "name": "Cryptofede", + "teamId": 1 + }, + { + "id": 7, + "name": "Matteo Georges", + "teamId": 2 + }, + { + "id": 8, + "name": "Benjamin Flores", + "teamId": 2 + }, + { + "id": 9, + "name": "Antiyro", + "teamId": 2 + }, + { + "id": 10, + "name": "Maxime", + "teamId": 2 + }, + { + "id": 11, + "name": "Matthias Hallgren", + "teamId": 2 + }, + { + "id": 12, + "name": "Paul-Henry", + "teamId": 2 + }, + { + "id": 13, + "name": "Trinity", + "teamId": 2 + }, + { + "id": 14, + "name": "forrest", + "teamId": 3 + }, + { + "id": 15, + "name": "Marouen Zelleg", + "teamId": 3 + }, + { + "id": 16, + "name": "Robbie Liu", + "teamId": 3 + }, + { + "id": 17, + "name": "Pratham Prasoon", + "teamId": 3 + }, + { + "id": 18, + "name": "Kevin", + "teamId": 3 + }, + { + "id": 19, + "name": "redrum", + "teamId": 3 + }, + { + "id": 20, + "name": "Bennett Davis", + "teamId": 3 + }, + { + "id": 21, + "name": "Dan", + "teamId": 4 + }, + { + "id": 22, + "name": "Biaf", + "teamId": 4 + }, + { + "id": 23, + "name": "Francesco Web3", + "teamId": 4 + }, + { + "id": 24, + "name": "Altan Tutar", + "teamId": 4 + }, + { + "id": 25, + "name": "Abi", + "teamId": 4 + }, + { + "id": 26, + "name": "Pierre Ni", + "teamId": 4 + }, + { + "id": 27, + "name": "Gabriel Begazo", + "teamId": 5 + }, + { + "id": 28, + "name": "Sacha Marcus", + "teamId": 5 + }, + { + "id": 29, + "name": "Kevin", + "teamId": 5 + }, + { + "id": 30, + "name": "Azi", + "teamId": 5 + }, + { + "id": 31, + "name": "Firat", + "teamId": 5 + }, + { + "id": 32, + "name": "Marian", + "teamId": 5 + }, + { + "id": 33, + "name": "Alex", + "teamId": 5 + }, + { + "id": 34, + "name": "Naruto", + "teamId": 6 + }, + { + "id": 35, + "name": "Prabal", + "teamId": 6 + }, + { + "id": 36, + "name": "qedk", + "teamId": 6 + }, + { + "id": 37, + "name": "Robin", + "teamId": 6 + }, + { + "id": 38, + "name": "Abheek", + "teamId": 6 + }, + { + "id": 39, + "name": "Neil", + "teamId": 6 + }, + { + "id": 40, + "name": "Vibhu", + "teamId": 6 + }, + { + "id": 41, + "name": "Kyle", + "teamId": 6 + }, + { + "id": 42, + "name": "Paul Vacaru", + "teamId": 7 + }, + { + "id": 43, + "name": "Player1Taco", + "teamId": 7 + }, + { + "id": 44, + "name": "Kacper", + "teamId": 7 + }, + { + "id": 45, + "name": "Tomer Cohen", + "teamId": 7 + }, + { + "id": 46, + "name": "Jeffrey", + "teamId": 7 + }, + { + "id": 47, + "name": "Juan Calderon", + "teamId": 7 + }, + { + "id": 48, + "name": "Mel", + "teamId": 8 + }, + { + "id": 49, + "name": "Julio Cruz", + "teamId": 8 + }, + { + "id": 50, + "name": "Christian Narvaez", + "teamId": 8 + }, + { + "id": 51, + "name": "Amado", + "teamId": 8 + }, + { + "id": 52, + "name": "Mike Mendes", + "teamId": 9 + }, + { + "id": 53, + "name": "Alexander Ghahremany", + "teamId": 9 + }, + { + "id": 54, + "name": "Halcyon Price", + "teamId": 9 + }, + { + "id": 55, + "name": "Mike Stone", + "teamId": 9 + }, + { + "id": 56, + "name": "Anirudh Suresh", + "teamId": 9 + }, + { + "id": 57, + "name": "Will", + "teamId": 10 + }, + { + "id": 58, + "name": "Paul Bramas", + "teamId": 10 + }, + { + "id": 59, + "name": "Kraznik", + "teamId": 10 + }, + { + "id": 60, + "name": "Samson", + "teamId": 10 + }, + { + "id": 61, + "name": "Prady", + "teamId": 10 + }, + { + "id": 62, + "name": "Kenil", + "teamId": 10 + }, + { + "id": 63, + "name": "Onallee", + "teamId": 11 + }, + { + "id": 64, + "name": "Esther", + "teamId": 11 + }, + { + "id": 65, + "name": "Solene", + "teamId": 11 + }, + { + "id": 66, + "name": "Ali", + "teamId": 11 + }, + { + "id": 67, + "name": "Gonzalo", + "teamId": 12 + }, + { + "id": 68, + "name": "Martin", + "teamId": 12 + }, + { + "id": 69, + "name": "Nocolas", + "teamId": 12 + }, + { + "id": 70, + "name": "Guido", + "teamId": 12 + }, + { + "id": 71, + "name": "F", + "teamId": 12 + }, + { + "id": 72, + "name": "Mati", + "teamId": 12 + } ], "logs": [] } -} +} \ No newline at end of file diff --git a/players.json b/players.json new file mode 100644 index 0000000..40b11df --- /dev/null +++ b/players.json @@ -0,0 +1,290 @@ +[ + { + "name": "Yash Saraswat", + "teamId": 1 + }, + { + "name": "Harpalsinh Jadeja", + "teamId": 1 + }, + { + "name": "Pawan Bajaj", + "teamId": 1 + }, + { + "name": "supernova", + "teamId": 1 + }, + { + "name": "Matias", + "teamId": 1 + }, + { + "name": "Cryptofede", + "teamId": 1 + }, + { + "name": "Matteo Georges", + "teamId": 2 + }, + { + "name": "Benjamin Flores", + "teamId": 2 + }, + { + "name": "Antiyro", + "teamId": 2 + }, + { + "name": "Maxime", + "teamId": 2 + }, + { + "name": "Matthias Hallgren", + "teamId": 2 + }, + { + "name": "Paul-Henry", + "teamId": 2 + }, + { + "name": "Trinity", + "teamId": 2 + }, + { + "name": "forrest", + "teamId": 3 + }, + { + "name": "Marouen Zelleg", + "teamId": 3 + }, + { + "name": "Robbie Liu", + "teamId": 3 + }, + { + "name": "Pratham Prasoon", + "teamId": 3 + }, + { + "name": "Kevin", + "teamId": 3 + }, + { + "name": "redrum", + "teamId": 3 + }, + { + "name": "Bennett Davis", + "teamId": 3 + }, + { + "name": "Dan", + "teamId": 4 + }, + { + "name": "Biaf", + "teamId": 4 + }, + { + "name": "Francesco Web3", + "teamId": 4 + }, + { + "name": "Altan Tutar", + "teamId": 4 + }, + { + "name": "Abi", + "teamId": 4 + }, + { + "name": "Pierre Ni", + "teamId": 4 + }, + { + "name": "Gabriel Begazo", + "teamId": 5 + }, + { + "name": "Sacha Marcus", + "teamId": 5 + }, + { + "name": "Kevin", + "teamId": 5 + }, + { + "name": "Azi", + "teamId": 5 + }, + { + "name": "Firat", + "teamId": 5 + }, + { + "name": "Marian", + "teamId": 5 + }, + { + "name": "Alex", + "teamId": 5 + }, + { + "name": "Naruto", + "teamId": 6 + }, + { + "name": "Prabal", + "teamId": 6 + }, + { + "name": "qedk", + "teamId": 6 + }, + { + "name": "Robin", + "teamId": 6 + }, + { + "name": "Abheek", + "teamId": 6 + }, + { + "name": "Neil", + "teamId": 6 + }, + { + "name": "Vibhu", + "teamId": 6 + }, + { + "name": "Kyle", + "teamId": 6 + }, + { + "name": "Paul Vacaru", + "teamId": 7 + }, + { + "name": "Player1Taco", + "teamId": 7 + }, + { + "name": "Kacper", + "teamId": 7 + }, + { + "name": "Tomer Cohen", + "teamId": 7 + }, + { + "name": "Jeffrey", + "teamId": 7 + }, + { + "name": "Juan Calderon", + "teamId": 7 + }, + { + "name": "Mel", + "teamId": 8 + }, + { + "name": "Julio Cruz", + "teamId": 8 + }, + { + "name": "Christian Narvaez", + "teamId": 8 + }, + { + "name": "Amado", + "teamId": 8 + }, + { + "name": "Mike Mendes", + "teamId": 9 + }, + { + "name": "Alexander Ghahremany", + "teamId": 9 + }, + { + "name": "Halcyon Price", + "teamId": 9 + }, + { + "name": "Mike Stone", + "teamId": 9 + }, + { + "name": "Anirudh Suresh", + "teamId": 9 + }, + { + "name": "Will", + "teamId": 10 + }, + { + "name": "Paul Bramas", + "teamId": 10 + }, + { + "name": "Kraznik", + "teamId": 10 + }, + { + "name": "Samson", + "teamId": 10 + }, + { + "name": "Prady", + "teamId": 10 + }, + { + "name": "Kenil", + "teamId": 10 + }, + { + "name": "Onallee", + "teamId": 11 + }, + { + "name": "Esther", + "teamId": 11 + }, + { + "name": "Solene", + "teamId": 11 + }, + { + "name": "Ali", + "teamId": 11 + }, + { + "name": "Gonzalo", + "teamId": 12 + }, + { + "name": "Martin", + "teamId": 12 + }, + { + "name": "Nocolas", + "teamId": 12 + }, + { + "name": "Guido", + "teamId": 12 + }, + { + "name": "F", + "teamId": 12 + }, + { + "name": "Mati", + "teamId": 12 + } +] \ No newline at end of file diff --git a/src/stackr/state.ts b/src/stackr/state.ts index bc66b0d..96cb1bf 100644 --- a/src/stackr/state.ts +++ b/src/stackr/state.ts @@ -58,7 +58,7 @@ export class League extends State { getRootHash(): string { const { admins, teams, players, matches, meta, logs } = this.state; const adminsMerkleTree = createMT(admins, (a) => - solidityPacked(["string"], [a]) + solidityPacked(["address"], [a]) ); const teamsMerkleTree = createMT(teams, (t) => diff --git a/src/stackr/transitions.ts b/src/stackr/transitions.ts index 92a9c14..1b5142c 100644 --- a/src/stackr/transitions.ts +++ b/src/stackr/transitions.ts @@ -35,9 +35,7 @@ export const canAddressSubmitAction = ( state: LeagueState, address: string ): boolean => { - // TODO: Implement this - // return state.admins.includes(address); - return true; + return state.admins.includes(address); }; const areAllMatchesComplete = (state: LeagueState) => {