Skip to content
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
7 changes: 7 additions & 0 deletions contracts/game_contract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2889,6 +2889,13 @@ impl GameContract {
return Err(ContractError::GameNotInProgress);
}

// Prevent a player from creating a tournament escrow against themselves (#933)
if let Some(ref player2) = game.player2 {
if game.player1 == *player2 {
return Err(ContractError::AlreadyJoined);
}
}

game.player1.require_auth();

let duration: u64 = env
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "72f0a51fbc601416dbc6322aa987586ade2406abb81a6abdb496b876d3e32096"
"bytes": "3b9c6c81fc99c55a841e784222dd49c2f65702f26161636947702b3a63c3c65c"
},
{
"i128": {
Expand Down Expand Up @@ -107,7 +107,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "72f0a51fbc601416dbc6322aa987586ade2406abb81a6abdb496b876d3e32096"
"bytes": "3b9c6c81fc99c55a841e784222dd49c2f65702f26161636947702b3a63c3c65c"
}
},
{
Expand Down Expand Up @@ -316,7 +316,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "72f0a51fbc601416dbc6322aa987586ade2406abb81a6abdb496b876d3e32096"
"bytes": "3b9c6c81fc99c55a841e784222dd49c2f65702f26161636947702b3a63c3c65c"
},
{
"i128": {
Expand Down Expand Up @@ -475,7 +475,7 @@
"bytes": "0202020202020202020202020202020202020202020202020202020202020202"
},
{
"bytes": "e187a3e32f5a9f730eada1c8a5ad4bda79b2d6bbd633aed5ee113d8f899b300a23e0d90bea6a50f7e516f0d38b0c65ca693d3d71bb3485eac59ff602f0e08f01"
"bytes": "3538cc9ef9278f9b7140e61df2794b450996a25e2f38a922b140b2b7ac935eac555d9312555e20dda403dab3ed1e399d9e6af7da0408af863c11d240891fa203"
}
]
}
Expand Down Expand Up @@ -555,7 +555,7 @@
"bytes": "0202020202020202020202020202020202020202020202020202020202020202"
},
{
"bytes": "e187a3e32f5a9f730eada1c8a5ad4bda79b2d6bbd633aed5ee113d8f899b300a23e0d90bea6a50f7e516f0d38b0c65ca693d3d71bb3485eac59ff602f0e08f01"
"bytes": "3538cc9ef9278f9b7140e61df2794b450996a25e2f38a922b140b2b7ac935eac555d9312555e20dda403dab3ed1e399d9e6af7da0408af863c11d240891fa203"
}
]
}
Expand Down Expand Up @@ -648,7 +648,7 @@
"bytes": "0202020202020202020202020202020202020202020202020202020202020202"
},
{
"bytes": "e187a3e32f5a9f730eada1c8a5ad4bda79b2d6bbd633aed5ee113d8f899b300a23e0d90bea6a50f7e516f0d38b0c65ca693d3d71bb3485eac59ff602f0e08f01"
"bytes": "3538cc9ef9278f9b7140e61df2794b450996a25e2f38a922b140b2b7ac935eac555d9312555e20dda403dab3ed1e399d9e6af7da0408af863c11d240891fa203"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "54df8604a6c657b4d9f78029a6ad6f051a3ffc0ac5b4d64d794e46b19fd226a7"
"bytes": "8b2df2dc3e026abd0328753e67b0740c2cc5cf73066d92314454762b8cbee76d"
},
{
"i128": {
Expand Down Expand Up @@ -108,7 +108,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "54df8604a6c657b4d9f78029a6ad6f051a3ffc0ac5b4d64d794e46b19fd226a7"
"bytes": "8b2df2dc3e026abd0328753e67b0740c2cc5cf73066d92314454762b8cbee76d"
}
},
{
Expand Down Expand Up @@ -317,7 +317,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "54df8604a6c657b4d9f78029a6ad6f051a3ffc0ac5b4d64d794e46b19fd226a7"
"bytes": "8b2df2dc3e026abd0328753e67b0740c2cc5cf73066d92314454762b8cbee76d"
},
{
"i128": {
Expand Down Expand Up @@ -525,7 +525,7 @@
"bytes": "0101010101010101010101010101010101010101010101010101010101010101"
},
{
"bytes": "e153150ae705cbafbd1b48307519837361763723d4842193ced3b785516d7caef5be4be839ed888d5a44ce4fd8321d952791e6f4c9dde35c3473d891e7099304"
"bytes": "dd509e7979625c3dfa72f54f21ca5d7039f065b898c594a672a98c4acb1405f957dc09ee9a1dcb1811e78733c864f8b6fd12df9070667b5f7b4c678e0508070a"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "6fd6d78431e501bc112eb5b6690f687481a6be94e4d6321bfba7a5111c0b2950"
"bytes": "78f8e228f477a269d1b95b43dc0fbb7456deda793a483f63e3d9b6b86a2b3188"
},
{
"i128": {
Expand Down Expand Up @@ -78,7 +78,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "6fd6d78431e501bc112eb5b6690f687481a6be94e4d6321bfba7a5111c0b2950"
"bytes": "78f8e228f477a269d1b95b43dc0fbb7456deda793a483f63e3d9b6b86a2b3188"
}
},
{
Expand Down Expand Up @@ -229,7 +229,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "6fd6d78431e501bc112eb5b6690f687481a6be94e4d6321bfba7a5111c0b2950"
"bytes": "78f8e228f477a269d1b95b43dc0fbb7456deda793a483f63e3d9b6b86a2b3188"
},
{
"i128": {
Expand Down Expand Up @@ -304,7 +304,7 @@
"u64": 7
},
{
"bytes": "777abe383aa84078cd09105a4054515f2d60240ff44118600b525a74931dd6457dd8209410e7a2db39f91ee40dc98ae6df1ddf3990b469a5209590075ed9f707"
"bytes": "725513cb5542c63319c700db034363f6afb135b772fe0982ec56b690289ad27115d21d158bc391479a7f1d566d29fcc8840be81c4554d44d4df7a66817056601"
}
]
}
Expand Down Expand Up @@ -403,7 +403,7 @@
"u64": 7
},
{
"bytes": "777abe383aa84078cd09105a4054515f2d60240ff44118600b525a74931dd6457dd8209410e7a2db39f91ee40dc98ae6df1ddf3990b469a5209590075ed9f707"
"bytes": "725513cb5542c63319c700db034363f6afb135b772fe0982ec56b690289ad27115d21d158bc391479a7f1d566d29fcc8840be81c4554d44d4df7a66817056601"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "b3a14f36d534ebd496422fe1b84717e9164554830c7c029a6e906e9d604e7a02"
"bytes": "d4bea7faf8d933e59b66744f8950bd08bf365f004dd9bd0c358b70dde4a2eba7"
},
{
"i128": {
Expand Down Expand Up @@ -78,7 +78,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "b3a14f36d534ebd496422fe1b84717e9164554830c7c029a6e906e9d604e7a02"
"bytes": "d4bea7faf8d933e59b66744f8950bd08bf365f004dd9bd0c358b70dde4a2eba7"
}
},
{
Expand Down Expand Up @@ -229,7 +229,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "b3a14f36d534ebd496422fe1b84717e9164554830c7c029a6e906e9d604e7a02"
"bytes": "d4bea7faf8d933e59b66744f8950bd08bf365f004dd9bd0c358b70dde4a2eba7"
},
{
"i128": {
Expand Down Expand Up @@ -304,7 +304,7 @@
"u64": 1
},
{
"bytes": "77d7044ae99d5edc9065654836d653bcfcdcf2a24286c2086a2d6c2ea02b32ebfcd966450893f5eb3ec566bfdee0e90ecfed78ac953eaa0d5c2fa6af88455d05"
"bytes": "f94fb9406938d98e20bdc13a70ea446b039185188727e236323d1d9f0cd61ffab095b3bf344d73ad85af8d229a00ac3be95244f39c2244f48f8555a8c35e720a"
}
]
}
Expand Down Expand Up @@ -428,7 +428,7 @@
"u64": 1
},
{
"bytes": "77d7044ae99d5edc9065654836d653bcfcdcf2a24286c2086a2d6c2ea02b32ebfcd966450893f5eb3ec566bfdee0e90ecfed78ac953eaa0d5c2fa6af88455d05"
"bytes": "f94fb9406938d98e20bdc13a70ea446b039185188727e236323d1d9f0cd61ffab095b3bf344d73ad85af8d229a00ac3be95244f39c2244f48f8555a8c35e720a"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "96ab47c0a55322190d1314a62ac29ce642d25d039d3ab2f24980741f514c02e8"
"bytes": "af7d4d4e9b2f5cc30364a6820c43934bad043093f941bdbe3115a4f311b00279"
},
{
"i128": {
Expand Down Expand Up @@ -79,7 +79,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "96ab47c0a55322190d1314a62ac29ce642d25d039d3ab2f24980741f514c02e8"
"bytes": "af7d4d4e9b2f5cc30364a6820c43934bad043093f941bdbe3115a4f311b00279"
}
},
{
Expand Down Expand Up @@ -267,7 +267,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "96ab47c0a55322190d1314a62ac29ce642d25d039d3ab2f24980741f514c02e8"
"bytes": "af7d4d4e9b2f5cc30364a6820c43934bad043093f941bdbe3115a4f311b00279"
},
{
"i128": {
Expand Down Expand Up @@ -342,7 +342,7 @@
"u64": 42
},
{
"bytes": "efc7dd08e1a19e10b2d4440d58325c7fc99e30df229b45d7379f050e0fee3a2f963713a7e88886968bc1b2a0e16dd98aa36e11f4736ca151659857a32a627b07"
"bytes": "83d0b7f702cd0cf842db4da828273f8f76d10ec66a6db106cb60e1867221ca975de61c862aef7a7ac903c187f58c9734b99d61aea50e045aadcd0e7cda62400d"
}
]
}
Expand Down Expand Up @@ -431,7 +431,7 @@
"u64": 42
},
{
"bytes": "efc7dd08e1a19e10b2d4440d58325c7fc99e30df229b45d7379f050e0fee3a2f963713a7e88886968bc1b2a0e16dd98aa36e11f4736ca151659857a32a627b07"
"bytes": "83d0b7f702cd0cf842db4da828273f8f76d10ec66a6db106cb60e1867221ca975de61c862aef7a7ac903c187f58c9734b99d61aea50e045aadcd0e7cda62400d"
}
]
}
Expand Down Expand Up @@ -530,7 +530,7 @@
"u64": 42
},
{
"bytes": "efc7dd08e1a19e10b2d4440d58325c7fc99e30df229b45d7379f050e0fee3a2f963713a7e88886968bc1b2a0e16dd98aa36e11f4736ca151659857a32a627b07"
"bytes": "83d0b7f702cd0cf842db4da828273f8f76d10ec66a6db106cb60e1867221ca975de61c862aef7a7ac903c187f58c9734b99d61aea50e045aadcd0e7cda62400d"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "e489363a40d5051872e41a21967264d97f9c7d3c00efb47d63d6e6d66b49d5bc"
"bytes": "9d1f5ab123a8b6861c94802441c1e52cf8003028b8a28799e684348d0283080b"
},
{
"i128": {
Expand Down Expand Up @@ -80,7 +80,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "e489363a40d5051872e41a21967264d97f9c7d3c00efb47d63d6e6d66b49d5bc"
"bytes": "9d1f5ab123a8b6861c94802441c1e52cf8003028b8a28799e684348d0283080b"
}
},
{
Expand Down Expand Up @@ -268,7 +268,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "e489363a40d5051872e41a21967264d97f9c7d3c00efb47d63d6e6d66b49d5bc"
"bytes": "9d1f5ab123a8b6861c94802441c1e52cf8003028b8a28799e684348d0283080b"
},
{
"i128": {
Expand Down Expand Up @@ -343,7 +343,7 @@
"u64": 1
},
{
"bytes": "450e8d82282d867c7d22aae9291aa26323425c971cbd69fdb1c2f6fb2cd3f9c5252f7a94e79d939089c18e9ee90208f28ace6651da788330d58ee1c0e67a7205"
"bytes": "1a9029cfa4bf60d4ea39060f7ddc1d7a8904b9d1841611b05efb61208e79e595f857ee3427d7cec071a5fac05b5474146de76a97c55cb142562fde24f62a3604"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "3a48bb6674abae11f8ed4212baeb3a837ff617891c82395dd00ee74f3228a640"
"bytes": "711f820c3c46553d9cfb9fa0abaf67021442f1061e71fdf4dfc4a6f8e5efdb48"
},
{
"i128": {
Expand Down Expand Up @@ -81,7 +81,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "3a48bb6674abae11f8ed4212baeb3a837ff617891c82395dd00ee74f3228a640"
"bytes": "711f820c3c46553d9cfb9fa0abaf67021442f1061e71fdf4dfc4a6f8e5efdb48"
}
},
{
Expand Down Expand Up @@ -232,7 +232,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "3a48bb6674abae11f8ed4212baeb3a837ff617891c82395dd00ee74f3228a640"
"bytes": "711f820c3c46553d9cfb9fa0abaf67021442f1061e71fdf4dfc4a6f8e5efdb48"
},
{
"i128": {
Expand Down Expand Up @@ -328,7 +328,7 @@
"symbol": "signature"
},
"val": {
"bytes": "ef88b7018ba41ff00aab1e5b65f27f1e7890bb2d81f4d84a2ce9a1bf202e65f093a66527af629799b45711892ff21dd86b5f4716f5a670b8a743734067b1ad08"
"bytes": "a1542b7d687f1f19b9f6fc190a25d98947a70bac26f698ba42dbffe0954f073ef8619c963b8336b83c69dd86ea60747abc9e5bcbc44a77e5f171c755793e8e04"
}
}
]
Expand Down Expand Up @@ -367,7 +367,7 @@
"symbol": "signature"
},
"val": {
"bytes": "f6fb96feb2fc4facda605555d481f385f69c32c7ba018307db3696a34ee3a2a252ab14ae2c18c01d692be7cab0d4f337da11aa6904d2dd94b04b22cfde8d730d"
"bytes": "81d4001661c4d064af223cf9fe27a4eb9275cf92b2b0e045decbd1d99f9933363659f8bad4e3c266fd8a3a09d0bf43e968a68d6915993ea7aa998579bddd8206"
}
}
]
Expand Down Expand Up @@ -518,7 +518,7 @@
"symbol": "signature"
},
"val": {
"bytes": "ef88b7018ba41ff00aab1e5b65f27f1e7890bb2d81f4d84a2ce9a1bf202e65f093a66527af629799b45711892ff21dd86b5f4716f5a670b8a743734067b1ad08"
"bytes": "a1542b7d687f1f19b9f6fc190a25d98947a70bac26f698ba42dbffe0954f073ef8619c963b8336b83c69dd86ea60747abc9e5bcbc44a77e5f171c755793e8e04"
}
}
]
Expand Down Expand Up @@ -557,7 +557,7 @@
"symbol": "signature"
},
"val": {
"bytes": "f6fb96feb2fc4facda605555d481f385f69c32c7ba018307db3696a34ee3a2a252ab14ae2c18c01d692be7cab0d4f337da11aa6904d2dd94b04b22cfde8d730d"
"bytes": "81d4001661c4d064af223cf9fe27a4eb9275cf92b2b0e045decbd1d99f9933363659f8bad4e3c266fd8a3a09d0bf43e968a68d6915993ea7aa998579bddd8206"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "c52309c715d187c04e7105dc08f3459629a0d313f2e35ea3998d54e6ee73e4ed"
"bytes": "7fad82e67cc3507539ec98e1eb4d50551bb6035145efb7a112d54c3dcaf8997d"
},
{
"i128": {
Expand Down Expand Up @@ -78,7 +78,7 @@
"symbol": "ADMIN_KEY"
},
"val": {
"bytes": "c52309c715d187c04e7105dc08f3459629a0d313f2e35ea3998d54e6ee73e4ed"
"bytes": "7fad82e67cc3507539ec98e1eb4d50551bb6035145efb7a112d54c3dcaf8997d"
}
},
{
Expand Down Expand Up @@ -229,7 +229,7 @@
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
},
{
"bytes": "c52309c715d187c04e7105dc08f3459629a0d313f2e35ea3998d54e6ee73e4ed"
"bytes": "7fad82e67cc3507539ec98e1eb4d50551bb6035145efb7a112d54c3dcaf8997d"
},
{
"i128": {
Expand Down
Loading
Loading