upgrading all deps + fix bugs

marigold-dev · May 22, 2024 · f626299 · f626299
1 parent 255dd97
commit f626299
Show file tree

Hide file tree

Showing 19 changed files with 2,960 additions and 1,797 deletions.
diff --git a/README.md b/README.md
diff --git a/doc/www/index.html b/doc/www/index.html
diff --git a/solution/.ligo/repository_id b/solution/.ligo/repository_id
@@ -1 +1 @@
-bc89641e-438d-41d4-2742-b15c9d1a88c8
+f3077d23-ed35-4c76-06b5-812eebee9124
diff --git a/solution/.taq/config.json b/solution/.taq/config.json
@@ -59,11 +59,11 @@
         },
         {
             "type": "npm",
-            "name": "@taqueria/plugin-octez-client"
+            "name": "@taqueria/plugin-taquito"
         },
         {
             "type": "npm",
-            "name": "@taqueria/plugin-taquito"
+            "name": "@taqueria/plugin-octez-client"
         },
         {
             "type": "npm",

diff --git a/solution/.taq/development-state.json b/solution/.taq/development-state.json
@@ -1,43 +1,43 @@
 {
     "operations": {},
     "tasks": {
-        "@taqueria/plugin-ligo.compile.1695891128518": {
+        "@taqueria/plugin-ligo.compile.1716365568196": {
             "task": "compile",
             "plugin": "@taqueria/plugin-ligo",
-            "time": 1695891128518,
+            "time": 1716365568196,
             "output": [
                 {
                     "source": "pokeGame.jsligo",
                     "artifact": "artifacts/pokeGame.tz"
                 }
             ]
         },
-        "@taqueria/plugin-ligo.compile.1695891199370": {
+        "@taqueria/plugin-ligo.compile.1716365604486": {
             "task": "compile",
             "plugin": "@taqueria/plugin-ligo",
-            "time": 1695891199370,
+            "time": 1716365604486,
             "output": [
                 {
                     "source": "pokeGame.jsligo",
-                    "artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nNo parameter expressions found"
+                    "artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz"
                 }
             ]
         },
-        "@taqueria/plugin-ligo.compile.1695891415582": {
+        "@taqueria/plugin-ligo.compile.1716365628145": {
             "task": "compile",
             "plugin": "@taqueria/plugin-ligo",
-            "time": 1695891415582,
+            "time": 1716365628145,
             "output": [
                 {
                     "source": "pokeGame.jsligo",
                     "artifact": "artifacts/pokeGame.tz\nartifacts/pokeGame.default_storage.tz\nartifacts/pokeGame.parameter.default_parameter.tz"
                 }
             ]
         },
-        "@taqueria/plugin-octez-client.simulate.1695891426476": {
+        "@taqueria/plugin-octez-client.simulate.1716365701286": {
             "task": "simulate",
             "plugin": "@taqueria/plugin-octez-client",
-            "time": 1695891426476,
+            "time": 1716365701286,
             "output": [
                 {
                     "contract": "pokeGame.tz",

diff --git a/solution/.taq/state.json b/solution/.taq/state.json
@@ -1,7 +1,7 @@
 // WARNING: This file is autogenerated and should NOT be modified
 {
-    "build": "dcdfa46",
-    "configHash": "0aa853b0a563f6a702bb82cf7bc28d9c44950f37dad4c0e72745def668762ca1",
+    "build": "f20397e",
+    "configHash": "feb51de35a0ba10d16ce2b21c098fe418f393075818099b9b0efb17d57cf0cce",
     "tasks": {
         "ligo": {
             "type": "npm",
@@ -39,22 +39,6 @@
                 }
             ]
         },
-        "client": {
-            "type": "npm",
-            "name": "@taqueria/plugin-octez-client"
-        },
-        "typecheck": {
-            "type": "npm",
-            "name": "@taqueria/plugin-octez-client"
-        },
-        "typecheck-all": {
-            "type": "npm",
-            "name": "@taqueria/plugin-octez-client"
-        },
-        "simulate": {
-            "type": "npm",
-            "name": "@taqueria/plugin-octez-client"
-        },
         "deploy": {
             "type": "npm",
             "name": "@taqueria/plugin-taquito"
@@ -71,6 +55,22 @@
             "type": "npm",
             "name": "@taqueria/plugin-taquito"
         },
+        "client": {
+            "type": "npm",
+            "name": "@taqueria/plugin-octez-client"
+        },
+        "typecheck": {
+            "type": "npm",
+            "name": "@taqueria/plugin-octez-client"
+        },
+        "typecheck-all": {
+            "type": "npm",
+            "name": "@taqueria/plugin-octez-client"
+        },
+        "simulate": {
+            "type": "npm",
+            "name": "@taqueria/plugin-octez-client"
+        },
         "generate types": {
             "type": "npm",
             "name": "@taqueria/plugin-contract-types"
@@ -89,7 +89,7 @@
             "version": "0.1",
             "schema": "1.0",
             "alias": "ligo",
-            "postInstall": "node /home/zamrokk/training-dapp-1/solution/node_modules/@taqueria/plugin-ligo/postinstall.js",
+            "postInstall": "node /home/zamrokk/training-dapp-1/solution/node_modules/@taqueria/lib-ligo/postinstall.js",
             "tasks": [
                 {
                     "task": "ligo",
@@ -185,95 +185,6 @@
                 }
             ]
         },
-        {
-            "name": "@taqueria/plugin-octez-client",
-            "version": "0.1",
-            "schema": "1.0",
-            "alias": "tezos-client",
-            "tasks": [
-                {
-                    "task": "client",
-                    "command": "client",
-                    "description": "This task allows you to run arbitrary octez-client native commands. Note that they might not benefit from the abstractions provided by Taqueria",
-                    "encoding": "none",
-                    "handler": "proxy",
-                    "options": [
-                        {
-                            "shortFlag": "c",
-                            "flag": "command",
-                            "description": "The command to be passed to the underlying octez-client binary, wrapped in quotes",
-                            "type": "string",
-                            "required": true
-                        }
-                    ]
-                },
-                {
-                    "task": "typecheck",
-                    "command": "typecheck <sourceFile>",
-                    "aliases": [
-                        "tc"
-                    ],
-                    "description": "Typecheck a Michelson contract",
-                    "encoding": "json",
-                    "handler": "proxy",
-                    "positionals": [
-                        {
-                            "placeholder": "sourceFile",
-                            "description": "The name of the Michelson contract you wish to typecheck"
-                        }
-                    ]
-                },
-                {
-                    "task": "typecheck-all",
-                    "command": "typecheck-all",
-                    "description": "Typecheck all Michelson contracts in the artifacts directory",
-                    "encoding": "json",
-                    "handler": "proxy"
-                },
-                {
-                    "task": "simulate",
-                    "command": "simulate <sourceFile>",
-                    "aliases": [
-                        "sim"
-                    ],
-                    "description": "Run a Michelson contract as a simulation",
-                    "encoding": "json",
-                    "handler": "proxy",
-                    "options": [
-                        {
-                            "flag": "storage",
-                            "description": "Name of the storage file that contains the storage value as a Michelson expression, in the artifacts directory, used for originating a contract",
-                            "required": false
-                        },
-                        {
-                            "flag": "param",
-                            "description": "Name of the parameter file that contains the parameter value as a Michelson expression, in the artifacts directory, used for invoking a deployed contract",
-                            "required": true
-                        },
-                        {
-                            "flag": "entrypoint",
-                            "description": "You may explicitly specify an entrypoint to make the parameter value shorter, without having to specify a chain of (Left (Right ... 14 ...))",
-                            "required": false
-                        }
-                    ],
-                    "positionals": [
-                        {
-                            "placeholder": "sourceFile",
-                            "description": "The name of the Michelson contract you wish to simulate"
-                        }
-                    ]
-                },
-                {
-                    "task": "get-image",
-                    "command": "get-image",
-                    "description": "Gets the name of the image to be used",
-                    "hidden": true,
-                    "handler": "proxy"
-                }
-            ],
-            "operations": [],
-            "templates": []
-        },
         {
             "name": "@taqueria/plugin-taquito",
             "version": "0.1",
@@ -385,6 +296,95 @@
             "operations": [],
             "templates": []
         },
+        {
+            "name": "@taqueria/plugin-octez-client",
+            "version": "0.1",
+            "schema": "1.0",
+            "alias": "tezos-client",
+            "tasks": [
+                {
+                    "task": "client",
+                    "command": "client",
+                    "description": "This task allows you to run arbitrary octez-client native commands. Note that they might not benefit from the abstractions provided by Taqueria",
+                    "encoding": "none",
+                    "handler": "proxy",
+                    "options": [
+                        {
+                            "shortFlag": "c",
+                            "flag": "command",
+                            "description": "The command to be passed to the underlying octez-client binary, wrapped in quotes",
+                            "type": "string",
+                            "required": true
+                        }
+                    ]
+                },
+                {
+                    "task": "typecheck",
+                    "command": "typecheck <sourceFile>",
+                    "aliases": [
+                        "tc"
+                    ],
+                    "description": "Typecheck a Michelson contract",
+                    "encoding": "json",
+                    "handler": "proxy",
+                    "positionals": [
+                        {
+                            "placeholder": "sourceFile",
+                            "description": "The name of the Michelson contract you wish to typecheck"
+                        }
+                    ]
+                },
+                {
+                    "task": "typecheck-all",
+                    "command": "typecheck-all",
+                    "description": "Typecheck all Michelson contracts in the artifacts directory",
+                    "encoding": "json",
+                    "handler": "proxy"
+                },
+                {
+                    "task": "simulate",
+                    "command": "simulate <sourceFile>",
+                    "aliases": [
+                        "sim"
+                    ],
+                    "description": "Run a Michelson contract as a simulation",
+                    "encoding": "json",
+                    "handler": "proxy",
+                    "options": [
+                        {
+                            "flag": "storage",
+                            "description": "Name of the storage file that contains the storage value as a Michelson expression, in the artifacts directory, used for originating a contract",
+                            "required": false
+                        },
+                        {
+                            "flag": "param",
+                            "description": "Name of the parameter file that contains the parameter value as a Michelson expression, in the artifacts directory, used for invoking a deployed contract",
+                            "required": true
+                        },
+                        {
+                            "flag": "entrypoint",
+                            "description": "You may explicitly specify an entrypoint to make the parameter value shorter, without having to specify a chain of (Left (Right ... 14 ...))",
+                            "required": false
+                        }
+                    ],
+                    "positionals": [
+                        {
+                            "placeholder": "sourceFile",
+                            "description": "The name of the Michelson contract you wish to simulate"
+                        }
+                    ]
+                },
+                {
+                    "task": "get-image",
+                    "command": "get-image",
+                    "description": "Gets the name of the image to be used",
+                    "hidden": true,
+                    "handler": "proxy"
+                }
+            ],
+            "operations": [],
+            "templates": []
+        },
         {
             "name": "@taqueria/plugin-contract-types",
             "version": "0.1",

diff --git a/solution/.taq/testing-state.json b/solution/.taq/testing-state.json
@@ -1,17 +1,15 @@
 {
     "operations": {},
     "tasks": {
-        "@taqueria/plugin-taquito.deploy.1695893045368": {
+        "@taqueria/plugin-taquito.deploy.1716365763074": {
             "task": "deploy",
             "plugin": "@taqueria/plugin-taquito",
-            "time": 1695893045368,
+            "time": 1716365763074,
             "output": [
                 {
                     "contract": "pokeGame.tz",
-                    "address": "KT1G8tx4qSeJmKRY1p2oxA6eYoCGc9Qi3Fky",
-                    "alias": "pokeGame",
-                    "balanceInMutez": "0",
-                    "destination": "https://ghostnet.ecadinfra.com"
+                    "address": "KT1KcoXaXnsteDUoLkX41jc4cJmfG28gcfqT",
+                    "alias": "pokeGame"
                 }
             ]
         }

diff --git a/solution/app/.env b/solution/app/.env
@@ -1 +1 @@
-VITE_CONTRACT_ADDRESS=KT1G8tx4qSeJmKRY1p2oxA6eYoCGc9Qi3Fky
+VITE_CONTRACT_ADDRESS=KT1KcoXaXnsteDUoLkX41jc4cJmfG28gcfqT
diff --git a/solution/app/README.md b/solution/app/README.md
@@ -14,12 +14,15 @@ If you are developing a production application, we recommend updating the config
 - Configure the top-level `parserOptions` property like this:
 
 ```js
-   parserOptions: {
+export default {
+  // other rules...
+  parserOptions: {
     ecmaVersion: 'latest',
     sourceType: 'module',
     project: ['./tsconfig.json', './tsconfig.node.json'],
     tsconfigRootDir: __dirname,
-   },
+  },
+}
 ```
 
 - Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		bc89641e-438d-41d4-2742-b15c9d1a88c8
		f3077d23-ed35-4c76-06b5-812eebee9124
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VITE_CONTRACT_ADDRESS=KT1G8tx4qSeJmKRY1p2oxA6eYoCGc9Qi3Fky
		VITE_CONTRACT_ADDRESS=KT1KcoXaXnsteDUoLkX41jc4cJmfG28gcfqT