Skip to content

Commit

Permalink
upgrade to taqueria 0.40.0 to remove a bug in type generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@zamrokk
zamrokk committed Sep 21, 2023
1 parent fbbe4dc commit 8bc86e4
Show file tree
Hide file tree
Showing 9 changed files with 444 additions and 26,753 deletions.
4 changes: 2 additions & 2 deletions solution/.taq/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@
"plugins": [
{
"type": "npm",
"name": "@taqueria/plugin-ligo"
"name": "@taqueria/plugin-contract-types"
},
{
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
{
"type": "npm",
"name": "@taqueria/plugin-contract-types"
"name": "@taqueria/plugin-ligo"
}
]
}
243 changes: 125 additions & 118 deletions solution/.taq/state.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
// WARNING: This file is autogenerated and should NOT be modified
{
"build": "6a57340",
"configHash": "27035290c16369a935e7d37e803f7c4fa70140b5fb59c7ef34bddbef5196574e",
"build": "dcdfa46",
"configHash": "512d7245ced56cc5c35c197322d1f609386620baa24109ec9f7d80a07602148b",
"tasks": {
"ligo": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"compile": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"compile-all": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"test": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"get-image": {
"generate types": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
"name": "@taqueria/plugin-contract-types"
},
"deploy": {
"type": "npm",
Expand All @@ -39,9 +23,25 @@
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"generate types": {
"ligo": {
"type": "npm",
"name": "@taqueria/plugin-contract-types"
"name": "@taqueria/plugin-ligo"
},
"compile": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"compile-all": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"test": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"get-image": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
}
},
"operations": {},
Expand All @@ -53,98 +53,42 @@
},
"plugins": [
{
"name": "@taqueria/plugin-ligo",
"name": "@taqueria/plugin-contract-types",
"version": "0.1",
"schema": "1.0",
"alias": "ligo",
"alias": "contract-types",
"tasks": [
{
"task": "ligo",
"command": "ligo",
"description": "This task allows you to run arbitrary LIGO 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 LIGO binary, wrapped in quotes",
"type": "string",
"required": true
}
]
},
{
"task": "compile",
"command": "compile <sourceFile>",
"task": "generate types",
"command": "generate types [typescriptDir]",
"aliases": [
"c",
"compile-ligo"
"gen types",
"gentypes"
],
"description": "Compile a smart contract written in a LIGO syntax to Michelson code, along with its associated storage/parameter list files if they are found",
"encoding": "json",
"description": "Generate types for a contract to be used with taquito",
"handler": "proxy",
"options": [
{
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
"shortFlag": "t",
"flag": "typeAliasMode",
"description": "The type aliases used in the generated types",
"choices": [
"file",
"simple"
]
}
]
},
{
"task": "compile-all",
"command": "compile-all",
"description": "Compile all main smart contracts written in a LIGO syntax to Michelson code, along with their associated storage/parameter list files if they are found",
"encoding": "json",
"handler": "proxy",
"options": [
],
"positionals": [
{
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
"placeholder": "typescriptDir",
"description": "The output directory for the generated type files",
"defaultValue": "types"
}
]
},
{
"task": "test",
"command": "test <sourceFile>",
"description": "Test a smart contract written in LIGO",
"encoding": "json",
"handler": "proxy"
},
{
"task": "get-image",
"command": "get-image",
"description": "Gets the name of the image to be used",
"hidden": true,
"handler": "proxy"
}
],
"operations": [],
"templates": [
{
"template": "contract",
"command": "contract <sourceFileName>",
"description": "Create a LIGO contract with boilerplate code",
"options": [
{
"shortFlag": "s",
"flag": "syntax",
"description": "The syntax used in the contract",
"type": "string"
}
],
"positionals": [
{
"placeholder": "sourceFileName",
"description": "The name of the LIGO contract to generate",
"type": "string"
}
],
"handler": "function"
}
]
"templates": []
},
{
"name": "@taqueria/plugin-taquito",
Expand Down Expand Up @@ -258,42 +202,105 @@
"templates": []
},
{
"name": "@taqueria/plugin-contract-types",
"name": "@taqueria/plugin-ligo",
"version": "0.1",
"schema": "1.0",
"alias": "contract-types",
"alias": "ligo",
"postInstall": "node /home/zamrokk/training-dapp-shifumi/solution/node_modules/@taqueria/plugin-ligo/postinstall.js",
"tasks": [
{
"task": "generate types",
"command": "generate types [typescriptDir]",
"task": "ligo",
"command": "ligo",
"description": "This task allows you to run arbitrary LIGO 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 LIGO binary, wrapped in quotes",
"type": "string",
"required": true
}
]
},
{
"task": "compile",
"command": "compile <sourceFile>",
"aliases": [
"gen types",
"gentypes"
"c",
"compile-ligo"
],
"description": "Generate types for a contract to be used with taquito",
"description": "Compile a smart contract written in a LIGO syntax to Michelson code, along with its associated storage/parameter list files if they are found",
"encoding": "json",
"handler": "proxy",
"options": [
{
"shortFlag": "t",
"flag": "typeAliasMode",
"description": "The type aliases used in the generated types",
"choices": [
"file",
"simple"
]
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
},
{
"shortFlag": "m",
"flag": "module",
"description": "The LIGO module to be compiled",
"type": "string"
}
],
"positionals": [
]
},
{
"task": "compile-all",
"command": "compile-all",
"description": "Compile all main smart contracts written in a LIGO syntax to Michelson code, along with their associated storage/parameter list files if they are found",
"encoding": "json",
"handler": "proxy",
"options": [
{
"placeholder": "typescriptDir",
"description": "The output directory for the generated type files",
"defaultValue": "types"
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
}
]
},
{
"task": "test",
"command": "test <sourceFile>",
"description": "Test a smart contract written in LIGO",
"encoding": "json",
"handler": "proxy"
},
{
"task": "get-image",
"command": "get-image",
"description": "Gets the name of the image to be used",
"hidden": true,
"handler": "proxy"
}
],
"operations": [],
"templates": []
"templates": [
{
"template": "contract",
"command": "contract <sourceFileName>",
"description": "Create a LIGO contract with boilerplate code",
"options": [
{
"shortFlag": "s",
"flag": "syntax",
"description": "The syntax used in the contract",
"type": "string"
}
],
"positionals": [
{
"placeholder": "sourceFileName",
"description": "The name of the LIGO contract to generate",
"type": "string"
}
],
"handler": "function"
}
]
}
]
}
6 changes: 3 additions & 3 deletions solution/app/node_modules/.vite/deps/@taquito_beacon-wallet.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions solution/app/node_modules/.vite/deps/@taquito_taquito.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8bc86e4

Please sign in to comment.