Skip to content

Commit

Permalink
Merge commit 'e1c4994c2d54563c45bfcefde89b526da6efdcd4' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@zamrokk
zamrokk committed Sep 29, 2023
2 parents 80ed492 + e1c4994 commit 144e837
Show file tree
Hide file tree
Showing 20 changed files with 1,267 additions and 1,673 deletions.
258 changes: 122 additions & 136 deletions README.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion solution/.ligo/repository_id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19432478-9fec-4867-ca5f-669aaf9df4ff
bc89641e-438d-41d4-2742-b15c9d1a88c8
2 changes: 1 addition & 1 deletion solution/.taq/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
{
"type": "npm",
"name": "@taqueria/plugin-tezos-client"
"name": "@taqueria/plugin-octez-client"
},
{
"type": "npm",
Expand Down
112 changes: 44 additions & 68 deletions solution/.taq/development-state.json
View file
Original file line number Diff line number Diff line change
@@ -1,148 +1,124 @@
{
"operations": {},
"tasks": {
"@taqueria/plugin-tezos-client.simulate.1691393786061": {
"@taqueria/plugin-octez-client.simulate.1695891426476": {
"task": "simulate",
"plugin": "@taqueria/plugin-tezos-client",
"time": 1691393786061,
"plugin": "@taqueria/plugin-octez-client",
"time": 1695891426476,
"output": [
{
"contract": "pokeGame.tz",
"result": "storage\n { \"tz1Ke2h7sDdakHJQh8WX4Z372du1KChsksyU\" }\nemitted operations\n \nbig_map diff\n \n\n"
}
]
},
"@taqueria/plugin-ligo.test.1691397133161": {
"task": "test",
"@taqueria/plugin-ligo.compile.1695974447083": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1691397133161,
"time": 1695974447083,
"output": [
{
"contract": "mutation_pokeGame.jsligo",
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\n\"contract deployed with values : \"\nKT1USnxrNkXwdetJQJ18uNgWJtaMDY4gdzPd(None)\nSuccess (1330n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1USnxrNkXwdetJQJ18uNgWJtaMDY4gdzPd}]}\n\"Sender 1 has balance : \"\n3800000000000mutez\nEverything at the top-level was executed.\n- test_mutation exited with value ().\n\n🎉 All tests passed 🎉"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
}
]
},
"@taqueria/plugin-ligo.test.1691399461929": {
"@taqueria/plugin-ligo.test.1695978469011": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1691399461929,
"time": 1695978469011,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\n\"*** Run test to pass ***\"\n\"contract deployed with values : \"\nKT1BKUzj4fKj9yD3U5w4HcCwSBum28pELgfi(None)\nSuccess (1860n)\n\"*** Check initial ticket is here ***\"\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> (KT1BKUzj4fKj9yD3U5w4HcCwSBum28pELgfi , (\"can_poke\" , 1n))]}\nSuccess (1024n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1BKUzj4fKj9yD3U5w4HcCwSBum28pELgfi}] ; ticketOwnership = []}\n\"*** Run test to fail ***\"\n\"contract deployed with values : \"\nKT1TvWVCW7y9jEWaEoBq6b5UHDY6PVrQ9ifQ(None)\nSuccess (1401n)\n\"*** Check initial ticket is here ***\"\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = []}\nFail (Rejected ((\"User does not have tickets => not allowed\" , KT1TvWVCW7y9jEWaEoBq6b5UHDY6PVrQ9ifQ)))\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = []}\nEverything at the top-level was executed.\n- testSender1Poke exited with value ().\n- testSender1PokeWithNoTicketsToFail exited with value ().\n\n🎉 All tests passed 🎉"
"contract": "mutation_pokeGame.jsligo",
"testResults": "Some tests failed :("
}
]
},
"@taqueria/plugin-ligo.compile.1691399476924": {
"task": "compile",
"@taqueria/plugin-ligo.test.1695978576844": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1691399476924,
"time": 1695978576844,
"output": [
{
"contract": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz"
},
{
"contract": "pokeGame.storageList.jsligo",
"artifact": "artifacts/pokeGame.default_storage.tz\n"
},
{
"contract": "pokeGame.parameterList.jsligo",
"artifact": "No parameter expressions found\n"
"contract": "mutation_pokeGame.jsligo",
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\n\"contract deployed with values : \"\nKT1L8mCbuTJXKq3CDoHDxqfH5aj5sEgAdx9C(None)\nSuccess (1330n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1L8mCbuTJXKq3CDoHDxqfH5aj5sEgAdx9C}]}\n\"Sender 1 has balance : \"\n3800000000000mutez\nEverything at the top-level was executed.\n- test_mutation exited with value ().\n\n🎉 All tests passed 🎉"
}
]
},
"@taqueria/plugin-ligo.compile.1691763895702": {
"@taqueria/plugin-ligo.compile.1695978929246": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1691763895702,
"time": 1695978929246,
"output": [
{
"contract": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz"
},
{
"contract": "pokeGame.storageList.jsligo",
"artifact": "artifacts/pokeGame.default_storage.tz\n"
},
{
"contract": "pokeGame.parameterList.jsligo",
"artifact": "No parameter expressions found\n"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
}
]
},
"@taqueria/plugin-ligo.compile.1695636082735": {
"@taqueria/plugin-ligo.compile.1695980240600": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1695636082735,
"time": 1695980240601,
"output": [
{
"contract": "pokeGame.jsligo",
"artifact": "Not compiled"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
}
]
},
"@taqueria/plugin-ligo.compile.1695636145534": {
"@taqueria/plugin-ligo.compile.1695980266300": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1695636145535,
"time": 1695980266300,
"output": [
{
"contract": "pokeGame.jsligo",
"artifact": "Not compiled"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
}
]
},
"@taqueria/plugin-ligo.compile.1695636260847": {
"task": "compile",
"@taqueria/plugin-ligo.test.1695980486180": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1695636260848,
"time": 1695980486180,
"output": [
{
"contract": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz"
},
{
"contract": "pokeGame.storageList.jsligo",
"artifact": "artifacts/pokeGame.default_storage.tz\n"
},
{
"contract": "pokeGame.parameterList.jsligo",
"artifact": "No parameter expressions found\n"
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
}
]
},
"@taqueria/plugin-ligo.test.1695636850933": {
"@taqueria/plugin-ligo.test.1695980609790": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1695636850933,
"time": 1695980609791,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
}
]
},
"@taqueria/plugin-ligo.test.1695636867184": {
"@taqueria/plugin-ligo.test.1695980691515": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1695636867184,
"time": 1695980691515,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\n\"*** Run test to pass ***\"\n\"contract deployed with values : \"\nKT1HeEVF74BLi3fYCpr1tpkDGmruFBNjMATo(None)\nSuccess (1858n)\n\"*** Check initial ticket is here ***\"\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> (KT1HeEVF74BLi3fYCpr1tpkDGmruFBNjMATo , (\"can_poke\" , 1n))]}\nSuccess (1024n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1HeEVF74BLi3fYCpr1tpkDGmruFBNjMATo}] ; ticketOwnership = []}\n\"*** Run test to fail ***\"\n\"contract deployed with values : \"\nKT1HDbqhYiKs8e3LkNAcT9T2MQgvUdxPtbV5(None)\nSuccess (1399n)\n\"*** Check initial ticket is here ***\"\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = []}\nFail (Rejected ((\"User does not have tickets => not allowed\" , KT1HDbqhYiKs8e3LkNAcT9T2MQgvUdxPtbV5)))\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = []}\nEverything at the top-level was executed.\n- testSender1Poke exited with value ().\n- testSender1PokeWithNoTicketsToFail exited with value ().\n\n🎉 All tests passed 🎉"
}
]
},
"@taqueria/plugin-ligo.test.1695636887053": {
"task": "test",
"@taqueria/plugin-ligo.compile.1695981005104": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1695636887053,
"time": 1695981005104,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\n\"*** Run test to pass ***\"\n\"contract deployed with values : \"\nKT1HTTu8MMiKpUu2ssMuNAE29KHmnzEisbBH(None)\nSuccess (1856n)\n\"*** Check initial ticket is here ***\"\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> (KT1HTTu8MMiKpUu2ssMuNAE29KHmnzEisbBH , (\"can_poke\" , 1n))]}\nSuccess (1024n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1HTTu8MMiKpUu2ssMuNAE29KHmnzEisbBH}] ; ticketOwnership = []}\n\"*** Run test to fail ***\"\n\"contract deployed with values : \"\nKT1KNS7YWBq3jfEW8v8upD8wXoYCNdH8uYWK(None)\nSuccess (1397n)\n\"*** Check initial ticket is here ***\"\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = []}\nFail (Rejected ((\"User does not have tickets => not allowed\" , KT1KNS7YWBq3jfEW8v8upD8wXoYCNdH8uYWK)))\n{feedback = \"kiss\" ; pokeTraces = [] ; ticketOwnership = []}\nEverything at the top-level was executed.\n- testSender1Poke exited with value ().\n- testSender1PokeWithNoTicketsToFail exited with value ().\n\n🎉 All tests passed 🎉"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
}
]
}
Expand Down
21 changes: 14 additions & 7 deletions solution/.taq/state.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// WARNING: This file is autogenerated and should NOT be modified
{
"build": "dcdfa46",
"configHash": "80e4352723c870e4fd434d2ffb0deb44fa8c47af3952caa6b023696a13a9883a",
"configHash": "3aa88081c59dc91dd5912be9d00b5886946e795b60f88d1305803161e9917e4d",
"tasks": {
"ligo": {
"type": "npm",
Expand Down Expand Up @@ -33,27 +33,27 @@
"choices": [
"@taqueria/plugin-ligo",
"ligo",
"@taqueria/plugin-tezos-client",
"@taqueria/plugin-octez-client",
"tezos-client"
]
}
]
},
"client": {
"type": "npm",
"name": "@taqueria/plugin-tezos-client"
"name": "@taqueria/plugin-octez-client"
},
"typecheck": {
"type": "npm",
"name": "@taqueria/plugin-tezos-client"
"name": "@taqueria/plugin-octez-client"
},
"typecheck-all": {
"type": "npm",
"name": "@taqueria/plugin-tezos-client"
"name": "@taqueria/plugin-octez-client"
},
"simulate": {
"type": "npm",
"name": "@taqueria/plugin-tezos-client"
"name": "@taqueria/plugin-octez-client"
},
"deploy": {
"type": "npm",
Expand Down Expand Up @@ -89,6 +89,7 @@
"version": "0.1",
"schema": "1.0",
"alias": "ligo",
"postInstall": "node /home/zamrokk/training-dapp-3/solution/node_modules/@taqueria/plugin-ligo/postinstall.js",
"tasks": [
{
"task": "ligo",
Expand Down Expand Up @@ -121,6 +122,12 @@
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
},
{
"shortFlag": "m",
"flag": "module",
"description": "The LIGO module to be compiled",
"type": "string"
}
]
},
Expand Down Expand Up @@ -179,7 +186,7 @@
]
},
{
"name": "@taqueria/plugin-tezos-client",
"name": "@taqueria/plugin-octez-client",
"version": "0.1",
"schema": "1.0",
"alias": "tezos-client",
Expand Down
18 changes: 9 additions & 9 deletions solution/.taq/testing-state.json
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{
"operations": {},
"tasks": {
"@taqueria/plugin-taquito.deploy.1691394144375": {
"@taqueria/plugin-taquito.deploy.1695893045368": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691394144375,
"time": 1695893045368,
"output": [
{
"contract": "pokeGame.tz",
"address": "KT1AzZ8SnvRn7Fn6e3jebcgPtxiMsJzeX2vp",
"address": "KT1G8tx4qSeJmKRY1p2oxA6eYoCGc9Qi3Fky",
"alias": "pokeGame",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
}
]
},
"@taqueria/plugin-taquito.deploy.1691397349548": {
"@taqueria/plugin-taquito.deploy.1695978944665": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691397349548,
"time": 1695978944665,
"output": [
{
"contract": "pokeGame.tz",
"address": "KT1J8JMbpAeefZPMFkm5m1oJbKMGVvB2fMt5",
"address": "KT1UY5c65W5RyzjbEuXW3xcHgL4S5vcGxYso",
"alias": "pokeGame",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
}
]
},
"@taqueria/plugin-taquito.deploy.1691399669995": {
"@taqueria/plugin-taquito.deploy.1695981024974": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691399669995,
"time": 1695981024974,
"output": [
{
"contract": "pokeGame.tz",
"address": "KT1EDsf1dPxgpBgCosu6a9TDExm2WJ9qNT2J",
"address": "KT1TC1DabCTmdMXuuCxwUmyb51bn2mbeNvbW",
"alias": "pokeGame",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
Expand Down
14 changes: 7 additions & 7 deletions solution/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
"preview": "vite preview"
},
"dependencies": {
"@airgap/beacon-sdk": "^4.0.6",
"@taquito/beacon-wallet": "^17.1.1",
"@taquito/taquito": "^17.1.1",
"@tzkt/sdk-api": "^2.2.0",
"@airgap/beacon-sdk": "^4.0.10",
"@taquito/beacon-wallet": "^17.3.1",
"@taquito/taquito": "^17.3.1",
"@tzkt/sdk-api": "^2.2.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@airgap/beacon-types": "^4.0.6",
"@airgap/beacon-types": "^4.0.10",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"@vitejs/plugin-react-swc": "^3.3.2",
"assert": "^2.0.0",
"assert": "^2.1.0",
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
"eslint": "^8.45.0",
Expand All @@ -37,7 +37,7 @@
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"typescript": "^5.0.2",
"url": "^0.11.1",
"url": "^0.11.3",
"vite": "^4.4.5"
}
}
Loading

0 comments on commit 144e837

Please sign in to comment.