Skip to content

Commit

Permalink
Merge commit '9147f56e51519fe8998cd1a08bd89c37b466a068' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@zamrokk
zamrokk committed Oct 11, 2023
2 parents 4db0696 + 9147f56 commit 70d5cf6
Show file tree
Hide file tree
Showing 30 changed files with 939 additions and 3,242 deletions.
206 changes: 108 additions & 98 deletions README.md
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 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-taquito"
"name": "@taqueria/plugin-ligo"
},
{
"type": "npm",
"name": "@taqueria/plugin-contract-types"
"name": "@taqueria/plugin-taquito"
},
{
"type": "npm",
"name": "@taqueria/plugin-ligo"
"name": "@taqueria/plugin-contract-types"
}
]
}
244 changes: 122 additions & 122 deletions solution/.taq/state.json
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,8 @@
// WARNING: This file is autogenerated and should NOT be modified
{
"build": "dcdfa46",
"configHash": "b792016328b3dfdfb382392c5825a23c65806fad5d40043edbb1fed3ffb6623e",
"configHash": "95cc0acc339d65cc234dee961459ad11d3c67febc5f5a89fc5714735e5b5b8c4",
"tasks": {
"deploy": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"transfer": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"fund": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"instantiate-account": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"generate types": {
"type": "npm",
"name": "@taqueria/plugin-contract-types"
},
"ligo": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
Expand All @@ -42,6 +22,26 @@
"get-image": {
"type": "npm",
"name": "@taqueria/plugin-ligo"
},
"deploy": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"transfer": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"fund": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"instantiate-account": {
"type": "npm",
"name": "@taqueria/plugin-taquito"
},
"generate types": {
"type": "npm",
"name": "@taqueria/plugin-contract-types"
}
},
"operations": {},
Expand All @@ -52,6 +52,107 @@
}
},
"plugins": [
{
"name": "@taqueria/plugin-ligo",
"version": "0.1",
"schema": "1.0",
"alias": "ligo",
"postInstall": "node /home/zamrokk/training-nft-4/solution/node_modules/@taqueria/plugin-ligo/postinstall.js",
"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>",
"aliases": [
"c",
"compile-ligo"
],
"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": [
{
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
},
{
"shortFlag": "m",
"flag": "module",
"description": "The LIGO module to be compiled",
"type": "string"
}
]
},
{
"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": [
{
"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": [
{
"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"
}
]
},
{
"name": "@taqueria/plugin-taquito",
"version": "0.1",
Expand Down Expand Up @@ -200,107 +301,6 @@
],
"operations": [],
"templates": []
},
{
"name": "@taqueria/plugin-ligo",
"version": "0.1",
"schema": "1.0",
"alias": "ligo",
"postInstall": "node /home/zamrokk/training-nft-4/solution/node_modules/@taqueria/plugin-ligo/postinstall.js",
"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>",
"aliases": [
"c",
"compile-ligo"
],
"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": [
{
"flag": "json",
"description": "Emit JSON-encoded Michelson",
"boolean": true
},
{
"shortFlag": "m",
"flag": "module",
"description": "The LIGO module to be compiled",
"type": "string"
}
]
},
{
"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": [
{
"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": [
{
"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"
}
]
}
]
}
38 changes: 12 additions & 26 deletions solution/.taq/testing-state.json
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,56 @@
{
"operations": {},
"tasks": {
"@taqueria/plugin-taquito.deploy.1691485137547": {
"@taqueria/plugin-taquito.deploy.1696518968789": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691485137547,
"time": 1696518968789,
"output": [
{
"contract": "nft.tz",
"address": "KT1SdFLhhL4Z4n4hWoMPxpa1R5LAq25TwQFi",
"address": "KT18sgGX5nu4BzwV2JtpQy4KCqc8cZU5MwnN",
"alias": "nft",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
}
]
},
"@taqueria/plugin-taquito.deploy.1691507549266": {
"@taqueria/plugin-taquito.deploy.1696852728145": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691507549266,
"time": 1696852728145,
"output": [
{
"contract": "nft.tz",
"address": "KT1CW31VxYi8rAL8X9jU4PY7ZWwhBwD8bmFF",
"address": "KT1KyV1Hprert33AAz5B94CLkqAHdKZU56dq",
"alias": "nft",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
}
]
},
"@taqueria/plugin-taquito.deploy.1691566862993": {
"@taqueria/plugin-taquito.deploy.1696938882527": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691566862993,
"time": 1696938882528,
"output": [
{
"contract": "nft.tz",
"address": "KT1WZFHYKPpfjPKMsCqLRQJzSUSrBWAm3gKC",
"address": "KT1EUWEeR9RHMb5q5jeW5jbhxBFHbLTqQgiZ",
"alias": "nft",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
}
]
},
"@taqueria/plugin-taquito.deploy.1691568841262": {
"@taqueria/plugin-taquito.deploy.1696942364056": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691568841262,
"time": 1696942364056,
"output": [
{
"contract": "nft.tz",
"address": "KT1AvnqrxBjccPZCj7KmAMfR7873ySRhwVkT",
"alias": "nft",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
}
]
},
"@taqueria/plugin-taquito.deploy.1691581782111": {
"task": "deploy",
"plugin": "@taqueria/plugin-taquito",
"time": 1691581782111,
"output": [
{
"contract": "nft.tz",
"address": "KT1LwiszjMiEXasgtuHLswaMjUUdm5ARBmvk",
"address": "KT1KAkKJdbx9FGwYhKfWN3pHovX1mb3fQpC4",
"alias": "nft",
"balanceInMutez": "0",
"destination": "https://ghostnet.ecadinfra.com"
Expand Down
1 change: 1 addition & 0 deletions solution/_ligo/ligo/installation.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"app@link-dev:./ligo.json":"/project","@ligo/[email protected]@ffffffff":"./.ligo/source/i/ligo__s__fa__1.0.8__ffffffff"}
2 changes: 1 addition & 1 deletion solution/app/.env
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VITE_CONTRACT_ADDRESS=KT1LwiszjMiEXasgtuHLswaMjUUdm5ARBmvk
VITE_CONTRACT_ADDRESS=KT1KAkKJdbx9FGwYhKfWN3pHovX1mb3fQpC4
VITE_PINATA_API_KEY=701d3e9951e2ad5e7d63
VITE_PINATA_API_SECRET=adc566d96514e6ddd076ad531c36b536e7b6f33b36625c136f2100d2909da880
VITE_TEZOS_NODE=https://ghostnet.tezos.marigold.dev
Expand Down
2 changes: 1 addition & 1 deletion solution/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@taquito/beacon-wallet": "^17.1.1",
"@taquito/taquito": "^17.1.1",
"@taquito/tzip12": "^17.1.1",
"@tzkt/sdk-api": "^2.2.0",
"@tzkt/sdk-api": "^2.2.1",
"formik": "^2.4.3",
"notistack": "^3.0.1",
"react": "^18.2.0",
Expand Down
Loading

0 comments on commit 70d5cf6

Please sign in to comment.