Skip to content

Commit

Permalink
Merge commit 'e1a8ef48d9f6e30cdbbb46aebb2a5be4c43e4882' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@zamrokk
zamrokk committed Sep 29, 2023
2 parents 14d177b + e1a8ef4 commit 5c66d53
Show file tree
Hide file tree
Showing 26 changed files with 2,025 additions and 2,365 deletions.
939 changes: 472 additions & 467 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,156 +1,132 @@
{
"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.compile.1691764048195": {
"task": "compile",
"@taqueria/plugin-ligo.test.1695980691515": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1691764048195,
"time": 1695980691515,
"output": [
{
"contract": "proxy.jsligo",
"artifact": "artifacts/proxy.tz"
},
{
"contract": "proxy.storageList.jsligo",
"artifact": "artifacts/proxy.default_storage.tz\n"
},
{
"contract": "proxy.parameterList.jsligo",
"artifact": ""
"contract": "unit_pokeGame.jsligo",
"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.compile.1691764068045": {
"@taqueria/plugin-ligo.compile.1695998240553": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1691764068045,
"time": 1695998240553,
"output": [
{
"contract": "pokeGameLambda.jsligo",
"artifact": "artifacts/pokeGameLambda.tz"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
},
{
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
}
]
},
"@taqueria/plugin-ligo.compile.1691764160054": {
"@taqueria/plugin-ligo.compile.1695998250379": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1691764160054,
"time": 1695998250379,
"output": [
{
"contract": "pokeGameLambda.jsligo",
"artifact": "artifacts/pokeGameLambda.tz"
},
{
"contract": "pokeGameLambda.storageList.jsligo",
"artifact": "No storage expressions found\n"
},
{
"contract": "pokeGameLambda.parameterList.jsligo",
"artifact": "No parameter expressions found\n"
"source": "proxy.jsligo",
"artifact": "artifacts/proxy.tz\nartifacts/proxy.default_storage.tz\nartifacts/proxy.parameter.initProxyWithV1.tz"
}
]
},
"@taqueria/plugin-ligo.compile.1693837601857": {
"@taqueria/plugin-ligo.compile.1695998891705": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1693837601857,
"time": 1695998891705,
"output": [
{
"contract": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz"
},
{
"contract": "pokeGame.storageList.jsligo",
"artifact": "artifacts/pokeGame.default_storage.tz\nartifacts/pokeGame.storage.storageV2.tz\n"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nartifacts/pokeGame.storage.storageV2.tz\nNo parameter expressions found"
},
{
"contract": "pokeGame.parameterList.jsligo",
"artifact": "No parameter expressions found\n"
"source": "pokeGame.jsligo",
"artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nartifacts/pokeGame.storage.storageV2.tz\nNo parameter expressions found"
}
]
},
"@taqueria/plugin-ligo.compile.1693837613825": {
"@taqueria/plugin-ligo.compile.1695999118447": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1693837613825,
"time": 1695999118447,
"output": [
{
"contract": "proxy.jsligo",
"artifact": "artifacts/proxy.tz"
},
{
"contract": "proxy.storageList.jsligo",
"artifact": "artifacts/proxy.default_storage.tz\n"
},
{
"contract": "proxy.parameterList.jsligo",
"artifact": ""
"source": "proxy.jsligo",
"artifact": "artifacts/proxy.tz\nartifacts/proxy.default_storage.tz\nartifacts/proxy.parameter.initProxyWithV1.tz\nartifacts/proxy.parameter.initProxyWithV2.tz"
}
]
},
"@taqueria/plugin-ligo.test.1693840595479": {
"task": "test",
"@taqueria/plugin-ligo.compile.1695999516416": {
"task": "compile",
"plugin": "@taqueria/plugin-ligo",
"time": 1693840595479,
"time": 1695999516416,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
"source": "proxy.jsligo",
"artifact": "artifacts/proxy.tz\nartifacts/proxy.default_storage.tz\nartifacts/proxy.parameter.initProxyWithV1.tz\nartifacts/proxy.parameter.initProxyWithV2.tz\nartifacts/proxy.parameter.changeVersionV1ToV2.tz"
}
]
},
"@taqueria/plugin-ligo.test.1693840607049": {
"@taqueria/plugin-ligo.test.1696000811378": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1693840607049,
"time": 1696000811378,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
}
]
},
"@taqueria/plugin-ligo.test.1693840649257": {
"@taqueria/plugin-ligo.test.1696000843873": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1693840649257,
"time": 1696000843873,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
}
]
},
"@taqueria/plugin-ligo.test.1693840690077": {
"@taqueria/plugin-ligo.test.1696000903641": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1693840690077,
"time": 1696000903641,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "Some tests failed :("
}
]
},
"@taqueria/plugin-ligo.test.1693841086075": {
"@taqueria/plugin-ligo.test.1696000960439": {
"task": "test",
"plugin": "@taqueria/plugin-ligo",
"time": 1693841086075,
"time": 1696000960439,
"output": [
{
"contract": "unit_pokeGame.jsligo",
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\nSuccess (2807n)\n{entrypoints = [\"changeVersion\" -> {addr = KT1HWpsJxenWT6m1Rjr71iQR5DXr5ffUYyEh ; method = \"changeVersion\"} ; \"Init\" -> {addr = KT1HWpsJxenWT6m1Rjr71iQR5DXr5ffUYyEh ; method = \"Init\"} ; \"feedback\" -> {addr = KT1HWpsJxenWT6m1Rjr71iQR5DXr5ffUYyEh ; method = \"feedback\"} ; \"Poke\" -> {addr = KT1HWpsJxenWT6m1Rjr71iQR5DXr5ffUYyEh ; method = \"Poke\"} ; \"PokeAndGetFeedback\" -> {addr = KT1HWpsJxenWT6m1Rjr71iQR5DXr5ffUYyEh ; method = \"PokeAndGetFeedback\"}] ; governance = tz1MBWU1WkszFfkEER2pgn4ATKXE9ng7x1sR}\n\"calling _testPokeGame on proxy : \"\nKT1UE3DgZCk9HK7GMQ9yTMDS6vkwheN2dX3a(None)\nSuccess (1359n)\n\"calling _testPokeGame on proxy : \"\nKT1UE3DgZCk9HK7GMQ9yTMDS6vkwheN2dX3a(None)\nSuccess (1357n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1HWpsJxenWT6m1Rjr71iQR5DXr5ffUYyEh}] ; ticketOwnership = [] ; tzip18 = {contractNext = None (()) ; contractPrevious = None (()) ; proxy = KT1UE3DgZCk9HK7GMQ9yTMDS6vkwheN2dX3a ; version = 1n}}\nEverything at the top-level was executed.\n- testSender1Poke exited with value ().\n\n🎉 All tests passed 🎉"
"testResults": "\"Sender 1 has balance : \"\n3800000000000mutez\nSuccess (2807n)\n{entrypoints = [\"changeVersion\" -> {addr = KT1PZ2MwkeECCaTtpLbVbTaG9UrdVNm43kiN ; method = \"changeVersion\"} ; \"Init\" -> {addr = KT1PZ2MwkeECCaTtpLbVbTaG9UrdVNm43kiN ; method = \"Init\"} ; \"feedback\" -> {addr = KT1PZ2MwkeECCaTtpLbVbTaG9UrdVNm43kiN ; method = \"feedback\"} ; \"Poke\" -> {addr = KT1PZ2MwkeECCaTtpLbVbTaG9UrdVNm43kiN ; method = \"Poke\"} ; \"PokeAndGetFeedback\" -> {addr = KT1PZ2MwkeECCaTtpLbVbTaG9UrdVNm43kiN ; method = \"PokeAndGetFeedback\"}] ; governance = tz1MBWU1WkszFfkEER2pgn4ATKXE9ng7x1sR}\n\"calling _testPokeGame on proxy : \"\nKT1SCUzs3fMR75b6Lp1w7ZisUWV3nHm6k75Z(None)\nSuccess (1359n)\n\"calling _testPokeGame on proxy : \"\nKT1SCUzs3fMR75b6Lp1w7ZisUWV3nHm6k75Z(None)\nSuccess (1357n)\n{feedback = \"kiss\" ; pokeTraces = [tz1hkMbkLPkvhxyqsQoBoLPqb1mruSzZx3zy -> {feedback = \"\" ; receiver = KT1PZ2MwkeECCaTtpLbVbTaG9UrdVNm43kiN}] ; ticketOwnership = [] ; tzip18 = {contractNext = None (()) ; contractPrevious = None (()) ; proxy = KT1SCUzs3fMR75b6Lp1w7ZisUWV3nHm6k75Z ; version = 1n}}\nEverything at the top-level was executed.\n- testSender1Poke exited with value ().\n\n🎉 All tests passed 🎉"
}
]
}
Expand Down
23 changes: 15 additions & 8 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": "72f27cf",
"configHash": "f2656a55015d2ecada534d41983a72fd2b6c2498405360dc60ec1c1bbbc169e7",
"build": "dcdfa46",
"configHash": "d9bfc120d5cd0de47f5e4b356e7e20e0d5750045f56dbb618c235da4613c1597",
"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-4/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
Loading

0 comments on commit 5c66d53

Please sign in to comment.