@taqueria/plugin-taquito 0.2.0 → 0.3.1

package/index.js

@@ -17,141 +17,129 @@ function $parcel$interopDefault(a) {
 
 const $806c5c6032403442$var$getContractAbspath = (contractFilename, parsedArgs)=>$iVZbm$path.join(parsedArgs.artifactsDir, /\.tz$/.test(contractFilename) ? contractFilename : `${contractFilename}.tz`)
 ;
-const $806c5c6032403442$var$originateContractToSandbox = async (contractFilename, parsedArgs, storage, sandboxName, sandbox)=>{
-    try {
-        if (sandbox && sandbox.rpcUrl) {
-            const contractAbspath = $806c5c6032403442$var$getContractAbspath(contractFilename, parsedArgs);
-            const tezos = new $iVZbm$taquitotaquito.TezosToolkit(sandbox.rpcUrl);
-            const secretKey = $806c5c6032403442$var$getAccountSecretKey(sandbox);
-            if (secretKey) {
-                tezos.setProvider({
-                    signer: new $iVZbm$taquitosigner.InMemorySigner(secretKey)
-                });
-                const contractData = await $iVZbm$fspromises.readFile(contractAbspath, "utf-8");
-                return tezos.contract.originate({
-                    code: contractData,
-                    storage: storage
-                }).then((operation)=>({
-                        contract: contractFilename,
-                        address: operation.contractAddress,
-                        destination: sandboxName
-                    })
-                ).catch((previous)=>Promise.reject({
-                        errCode: "E_ORIGINATE",
-                        errMsg: `Could not originate ${contractFilename} on the sandbox '${sandboxName}'`,
-                        previous: previous
-                    })
-                );
-            } else return Promise.reject({
-                errCode: "E_INVALID_SANDBOX_ACCOUNT",
-                errMsg: `Please configure a default account for the ${sandboxName} to be used for origination.`,
-                context: sandbox
-            });
-        }
-        return Promise.reject({
-            errCode: "E_INVALID_SANDBOX_URL",
-            errMsg: 'The sandbox configuration is invalid and missing the RPC url',
-            context: sandbox
-        });
-    } catch (err) {
-        return Promise.reject({
-            errCode: "E_ORIGINATE",
-            errMsg: "An unexpected error occured when trying to originate a contract",
-            previous: err
+const $806c5c6032403442$var$addOrigination = (parsedArgs, batch)=>async (mapping)=>{
+        const contractAbspath = $806c5c6032403442$var$getContractAbspath(mapping.filename, parsedArgs);
+        const contractData = await $iVZbm$fspromises.readFile(contractAbspath, "utf-8");
+        return (await batch).withOrigination({
+            code: contractData,
+            storage: mapping.storage
         });
     }
+;
+const $806c5c6032403442$var$getValidContracts = async (parsedArgs)=>{
+    const contracts = parsedArgs.contract ? [
+        parsedArgs.contract
+    ] : await ($parcel$interopDefault($iVZbm$fastglob))("**/*.tz", {
+        cwd: parsedArgs.artifactsDir
+    });
+    return contracts.reduce((retval, filename)=>{
+        const storage = $iVZbm$taquerianodesdk.getInitialStorage(parsedArgs)(filename);
+        if (!storage) throw `No initial storage provided for ${filename}`;
+        return [
+            ...retval,
+            {
+                filename: filename,
+                storage: storage
+            }
+        ];
+    }, []);
 };
-const $806c5c6032403442$var$originateContractToNetwork = async (contractFilename, parsedArgs, storage, networkName, network)=>{
-    try {
-        if (network && network.rpcUrl) {
-            const contractAbspath = $806c5c6032403442$var$getContractAbspath(contractFilename, parsedArgs);
-            const tezos = new $iVZbm$taquitotaquito.TezosToolkit(network.rpcUrl);
-            if (network.faucet) {
-                await $iVZbm$taquitosigner.importKey(tezos, network.faucet.email, network.faucet.password, network.faucet.mnemonic.join(' '), network.faucet.activation_code);
-                const contractData = await $iVZbm$fspromises.readFile(contractAbspath, "utf-8");
-                return tezos.contract.originate({
-                    code: contractData,
-                    storage: storage
-                }).then((operation)=>({
-                        contract: contractFilename,
-                        address: operation.contractAddress,
-                        destination: networkName
-                    })
-                ).catch((previous)=>Promise.reject({
-                        errCode: "E_ORIGINATE",
-                        errMsg: `Could not originate ${contractFilename} on the network '${networkName}'`,
-                        previous: previous
-                    })
-                );
-            } else return Promise.reject({
-                errCode: "E_INVALID_NETWORK_FAUCET",
-                errMsg: `Please configure a faucet for the ${network} network to be used for origination.`,
-                context: network
-            });
+const $806c5c6032403442$var$mapOpToContract = async (contracts, op, destination)=>{
+    debugger;
+    const results = await op.operationResults();
+    return contracts.reduce((retval, contract)=>{
+        // If initial storage was provided for the contract
+        // then we submitted an operation to originate that contract
+        if (contract.storage) {
+            const result = results.pop();
+            const address = result && result.metadata.operation_result.originated_contracts ? result.metadata.operation_result.originated_contracts.join(',') : 'Error';
+            return [
+                ...retval,
+                {
+                    contract: contract.filename,
+                    address: address,
+                    destination: destination
+                }
+            ];
         }
-        return Promise.reject({
-            errCode: "E_INVALID_NETWORK_URL",
-            errMsg: 'The network configuration is invalid and missing the RPC url',
-            context: network
-        });
-    } catch (err) {
-        return Promise.reject({
-            errCode: "E_ORIGINATE",
-            errMsg: "An unexpected error occured when trying to originate a contract",
-            previous: err
-        });
-    }
+        return [
+            ...retval,
+            {
+                contract: contract.filename,
+                address: "Error",
+                destination: destination
+            }
+        ];
+    }, []);
 };
-const $806c5c6032403442$var$getNetworkConfig = (networkName, config)=>{
-    return !config.network[networkName] ? undefined : config.network[networkName];
-};
-const $806c5c6032403442$var$getSandboxConfig = (sandboxName, config)=>{
-    return !config.sandbox[sandboxName] ? undefined : config.sandbox[sandboxName];
-};
-const $806c5c6032403442$var$getAccountSecretKey = (sandbox)=>{
-    if (sandbox.accounts && sandbox.accounts.default) {
-        const accountName = sandbox.accounts.default;
-        const accountDetails = sandbox.accounts[accountName];
-        if (accountDetails.keys) return accountDetails.keys.secretKey.replace(/unencrypted:/, '');
+const $806c5c6032403442$var$createBatch = async (parsedArgs, tezos, destination)=>{
+    const contracts = await $806c5c6032403442$var$getValidContracts(parsedArgs);
+    const batch1 = await contracts.reduce((batch, contractMapping)=>contractMapping.storage ? $806c5c6032403442$var$addOrigination(parsedArgs, batch)(contractMapping) : batch
+    , Promise.resolve(tezos.wallet.batch()));
+    try {
+        const op = await batch1.send();
+        const confirmed = await op.confirmation();
+        return await $806c5c6032403442$var$mapOpToContract(contracts, op, destination);
+    } catch (err) {
+        const error = err;
+        if (error.message) $iVZbm$taquerianodesdk.sendErr(error.message);
+        return undefined;
     }
-    return undefined;
 };
-const $806c5c6032403442$var$originateContract = (parsedArgs)=>(contractFilename)=>{
-        // TODO: Should getting the default environment be provided by the SDK or the framework?
-        const currentEnv = parsedArgs.env ? parsedArgs.env : parsedArgs.config.environment ? parsedArgs.config.environment.default : 'development';
-        const env = parsedArgs.config.environment && parsedArgs.config.environment[currentEnv] ? parsedArgs.config.environment[currentEnv] : undefined;
-        if (!env) return Promise.reject({
-            errCode: "E_INVALID_ENV",
-            errMsg: `No environment configured in your configuration file called ${parsedArgs.env}`,
-            context: parsedArgs.config
-        });
-        if (!env.storage || !env.storage[contractFilename]) return Promise.reject({
-            errCode: "E_INVALID_STORAGE",
-            errMsg: `No storage configured in your configuration file for ${contractFilename}`,
-            context: env
-        });
-        const networkProcesses = !env.networks ? [] : env.networks.reduce((retval, network)=>$806c5c6032403442$var$getNetworkConfig(network, parsedArgs.config) ? [
-                ...retval,
-                $806c5c6032403442$var$originateContractToNetwork(contractFilename, parsedArgs, env.storage[contractFilename], network, $806c5c6032403442$var$getNetworkConfig(network, parsedArgs.config))
-            ] : retval
-        , []);
-        const allProcesses = !env.sandboxes ? [] : env.sandboxes.reduce((retval, sandbox)=>$806c5c6032403442$var$getSandboxConfig(sandbox, parsedArgs.config) ? [
-                ...retval,
-                $806c5c6032403442$var$originateContractToSandbox(contractFilename, parsedArgs, env.storage[contractFilename], sandbox, $806c5c6032403442$var$getSandboxConfig(sandbox, parsedArgs.config))
-            ] : retval
-        , networkProcesses);
-        return Promise.all(allProcesses);
-    }
+const $806c5c6032403442$var$originateToNetworks = (parsedArgs, currentEnv)=>currentEnv.networks ? currentEnv.networks.reduce((retval, networkName)=>{
+        const network = $iVZbm$taquerianodesdk.getNetworkConfig(parsedArgs)(networkName);
+        if (network.rpcUrl) {
+            if (network.faucet) {
+                const result = (async ()=>{
+                    const tezos = new $iVZbm$taquitotaquito.TezosToolkit(network.rpcUrl);
+                    await $iVZbm$taquitosigner.importKey(tezos, network.faucet.email, network.faucet.password, network.faucet.mnemonic.join(' '), network.faucet.activation_code);
+                    return await $806c5c6032403442$var$createBatch(parsedArgs, tezos, networkName);
+                })();
+                return [
+                    ...retval,
+                    result
+                ];
+            } else $iVZbm$taquerianodesdk.sendErr(`Network ${networkName} requires a valid faucet in config.json.`);
+        } else $iVZbm$taquerianodesdk.sendErr(`Network "${networkName} is missing an RPC url in config.json."`);
+        return retval;
+    }, []) : []
 ;
-const $806c5c6032403442$var$originateAll = (parsedArgs)=>($parcel$interopDefault($iVZbm$fastglob))("**/*.tz", {
-        cwd: parsedArgs.artifactsDir
-    }).then((files)=>Promise.all(files.map($806c5c6032403442$var$originateContract(parsedArgs)))
-    ).then((results)=>results.flat(1)
-    )
+const $806c5c6032403442$var$originateToSandboxes = (parsedArgs, currentEnv)=>currentEnv.sandboxes ? currentEnv.sandboxes.reduce((retval, sandboxName)=>{
+        const sandbox = $iVZbm$taquerianodesdk.getSandboxConfig(parsedArgs)(sandboxName);
+        if (sandbox.rpcUrl) {
+            const secretKey = $iVZbm$taquerianodesdk.getDefaultAccount(parsedArgs)(sandboxName)?.keys?.secretKey;
+            if (secretKey) {
+                const result = (async ()=>{
+                    const tezos = new $iVZbm$taquitotaquito.TezosToolkit(sandbox.rpcUrl);
+                    tezos.setProvider({
+                        signer: new $iVZbm$taquitosigner.InMemorySigner(secretKey.replace(/^unencrypted:/, ''))
+                    });
+                    return await $806c5c6032403442$var$createBatch(parsedArgs, tezos, sandboxName);
+                })();
+                return [
+                    ...retval,
+                    result
+                ];
+            } else $iVZbm$taquerianodesdk.sendErr(`Sandbox ${sandboxName}'s default account is missing keys in config.json.`);
+        } else $iVZbm$taquerianodesdk.sendErr(`Sandbox "${sandboxName} is missing an RPC url in config.json."`);
+        return retval;
+    }, []) : []
 ;
 const $806c5c6032403442$export$acf571c34911f824 = (parsedArgs)=>{
-    const p = parsedArgs.contract ? $806c5c6032403442$var$originateContract(parsedArgs)(parsedArgs.contract) : $806c5c6032403442$var$originateAll(parsedArgs);
-    return p.then($iVZbm$taquerianodesdk.sendAsyncJsonRes);
+    const env = $iVZbm$taquerianodesdk.getCurrentEnvironmentConfig(parsedArgs);
+    if (!env) return $iVZbm$taquerianodesdk.sendAsyncErr(`There is no environment called ${parsedArgs.env} in your config.json.`);
+    const jobs1 = [
+        ...$806c5c6032403442$var$originateToNetworks(parsedArgs, env),
+        ...$806c5c6032403442$var$originateToSandboxes(parsedArgs, env)
+    ];
+    return Promise.all(jobs1).then((jobs)=>jobs.reduce((retval, originations)=>{
+            return originations ? [
+                ...retval,
+                ...originations
+            ] : retval;
+        }, [])
+    ).then((results)=>results && results.length > 0 ? $iVZbm$taquerianodesdk.sendJsonRes(results) : $iVZbm$taquerianodesdk.sendErr(`No contracts originated.`)
+    );
 };
 var $806c5c6032403442$export$2e2bcd8739ae039 = $806c5c6032403442$export$acf571c34911f824;
 

package/index.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["taqueria-plugin-taquito/index.ts","taqueria-plugin-taquito/originate.ts"],"sourcesContent":["import {Plugin, Task, EconomicalProtocol} from '@taqueria/node-sdk'\nimport type { i18n} from '@taqueria/node-sdk/types'\nimport originate from './originate'\n\nPlugin.create((i18n: i18n) => ({\n    alias: \"taquito\",\n    schema: \"1.0\",\n    version: \"0.1\",\n    tasks: [\n        Task.create({\n            task: \"deploy\",\n            command: \"deploy [contract]\",\n            description: \"Deploy a smart contract to a particular environment\",\n            options: [\n            ],\n            aliases: [\"originate\"],\n            handler: \"proxy\",\n            encoding: \"application/json\"\n        }),\n    ],\n    proxy: originate\n}), process.argv)\n","import { SanitizedArgs, PluginResponse, AccountDetails, Failure, LikeAPromise, Config, NetworkConfig, SandboxConfig} from \"@taqueria/node-sdk/types\";\nimport glob from 'fast-glob'\nimport {join} from 'path'\nimport { TezosToolkit } from '@taquito/taquito';\nimport {readFile} from 'fs/promises'\nimport { InMemorySigner, importKey } from '@taquito/signer';\nimport { sendAsyncJsonRes } from \"@taqueria/node-sdk\";\n\ntype Opts = SanitizedArgs & Record<string, unknown>\n\ninterface OriginationResult {\n    contract: string\n    address: string\n    destination: string\n}\n\nconst getContractAbspath = (contractFilename: string, parsedArgs: Opts) => \n    join(parsedArgs.artifactsDir, /\\.tz$/.test(contractFilename) ? contractFilename : `${contractFilename}.tz`)\n\n\nconst originateContractToSandbox = async (contractFilename: string, parsedArgs: Opts, storage: unknown, sandboxName: string, sandbox: SandboxConfig | undefined): LikeAPromise<OriginationResult, Failure<unknown>> => {\n    try {\n        if (sandbox && sandbox.rpcUrl) {\n            const contractAbspath = getContractAbspath(contractFilename, parsedArgs)\n            const tezos = new TezosToolkit(sandbox.rpcUrl)\n            const secretKey = getAccountSecretKey(sandbox)\n            if (secretKey) {\n                tezos.setProvider({\n                    signer: new InMemorySigner(secretKey),\n                });\n\n                const contractData = await readFile(contractAbspath, \"utf-8\")\n                return tezos.contract.originate({\n                    code: contractData,\n                    storage: storage\n                })\n                .then(operation => ({\n                    contract: contractFilename,\n                    address: operation.contractAddress as string,\n                    destination: sandboxName\n                }))\n                .catch(previous => Promise.reject({\n                    errCode: \"E_ORIGINATE\",\n                    errMsg: `Could not originate ${contractFilename} on the sandbox '${sandboxName}'`,\n                    previous\n                }))\n            }\n            else {\n                return Promise.reject({\n                    errCode: \"E_INVALID_SANDBOX_ACCOUNT\",\n                    errMsg: `Please configure a default account for the ${sandboxName} to be used for origination.`,\n                    context: sandbox\n                })\n            }\n        }\n        return Promise.reject({\n            errCode: \"E_INVALID_SANDBOX_URL\",\n            errMsg: 'The sandbox configuration is invalid and missing the RPC url',\n            context: sandbox\n        })\n    }\n    catch (err) {\n        return Promise.reject({\n            errCode: \"E_ORIGINATE\",\n            errMsg: \"An unexpected error occured when trying to originate a contract\",\n            previous: err\n        })\n    }\n}\n\nconst originateContractToNetwork = async (contractFilename: string, parsedArgs: Opts, storage: unknown, networkName: string, network: NetworkConfig|undefined): LikeAPromise<OriginationResult, Failure<unknown>> => {\n    try {\n        if (network && network.rpcUrl) {\n            const contractAbspath = getContractAbspath(contractFilename, parsedArgs)\n            const tezos = new TezosToolkit(network.rpcUrl)\n            if (network.faucet) {\n                await importKey(tezos, network.faucet.email, network.faucet.password, network.faucet.mnemonic.join(' '), network.faucet.activation_code)\n\n                const contractData = await readFile(contractAbspath, \"utf-8\")\n                return tezos.contract.originate({\n                    code: contractData,\n                    storage: storage\n                })\n                .then(operation => ({\n                    contract: contractFilename,\n                    address: operation.contractAddress as string,\n                    destination: networkName\n                }))\n                .catch(previous => Promise.reject({\n                    errCode: \"E_ORIGINATE\",\n                    errMsg: `Could not originate ${contractFilename} on the network '${networkName}'`,\n                    previous\n                }))\n            }\n            else {\n                return Promise.reject({\n                    errCode: \"E_INVALID_NETWORK_FAUCET\",\n                    errMsg: `Please configure a faucet for the ${network} network to be used for origination.`,\n                    context: network\n                })\n            }\n        }\n        return Promise.reject({\n            errCode: \"E_INVALID_NETWORK_URL\",\n            errMsg: 'The network configuration is invalid and missing the RPC url',\n            context: network\n        })\n    }\n    catch (err) {\n        return Promise.reject({\n            errCode: \"E_ORIGINATE\",\n            errMsg: \"An unexpected error occured when trying to originate a contract\",\n            previous: err\n        })\n    }\n}\n\nconst getNetworkConfig = (networkName: string, config: Config) => {\n    return !config.network[networkName]\n        ? undefined\n        : config.network[networkName]\n}\n\nconst getSandboxConfig = (sandboxName: string, config: Config) => {\n    return !config.sandbox[sandboxName]\n    ? undefined\n    : config.sandbox[sandboxName]\n}\n\nconst getAccountSecretKey = (sandbox: SandboxConfig) => {\n    if (sandbox.accounts && sandbox.accounts.default) {\n        const accountName = (sandbox.accounts.default as string);\n        const accountDetails = sandbox.accounts[accountName] as AccountDetails\n        if (accountDetails.keys) return accountDetails.keys.secretKey.replace(/unencrypted:/, '')\n    }\n\n    return undefined        \n}\n\nconst originateContract = (parsedArgs: Opts) => (contractFilename: string) => {\n    // TODO: Should getting the default environment be provided by the SDK or the framework?\n    const currentEnv = parsedArgs.env\n        ? (parsedArgs.env as string)\n        : (\n            parsedArgs.config.environment\n                ? parsedArgs.config.environment.default\n                : 'development'\n        )\n    const env = parsedArgs.config.environment && parsedArgs.config.environment[currentEnv]\n            ? parsedArgs.config.environment[currentEnv]\n            : undefined\n\n    if (!env) {\n        return Promise.reject({\n            errCode: \"E_INVALID_ENV\",\n            errMsg: `No environment configured in your configuration file called ${parsedArgs.env}`,\n            context: parsedArgs.config\n        })    \n    }\n\n    if (!env.storage || !env.storage[contractFilename]) {\n        return Promise.reject({\n            errCode: \"E_INVALID_STORAGE\",\n            errMsg: `No storage configured in your configuration file for ${contractFilename}`,\n            context: env\n        })\n    }\n\n    const networkProcesses = !env.networks ? [] : env.networks.reduce(\n        (retval: LikeAPromise<OriginationResult, Failure<unknown>>[], network) => \n            getNetworkConfig(network, parsedArgs.config)\n                ? [...retval, originateContractToNetwork(contractFilename, parsedArgs, env.storage[contractFilename], network, getNetworkConfig(network, parsedArgs.config))]\n                : retval,\n        []\n    )\n\n    const allProcesses = !env.sandboxes ? [] : env.sandboxes.reduce(\n        (retval: LikeAPromise<OriginationResult, Failure<unknown>>[], sandbox) => getSandboxConfig(sandbox, parsedArgs.config)\n            ? [...retval, originateContractToSandbox(contractFilename, parsedArgs, env.storage[contractFilename], sandbox, getSandboxConfig(sandbox, parsedArgs.config))]\n            : retval            \n        ,\n        networkProcesses\n    )\n            \n    return Promise.all(allProcesses)\n}\n\nconst originateAll = (parsedArgs: Opts) =>\n    glob(\"**/*.tz\", {cwd: parsedArgs.artifactsDir})\n    .then(files => Promise.all(files.map(originateContract(parsedArgs))))\n    .then(results => results.flat(1))\n\nexport const originate = <T>(parsedArgs: Opts): LikeAPromise<PluginResponse, Failure<T>> => {\n    const p = parsedArgs.contract\n        ? originateContract(parsedArgs) (parsedArgs.contract as string)\n        : originateAll(parsedArgs)\n\n    return p.then(sendAsyncJsonRes)\n}\n\nexport default originate"],"names":[],"version":3,"file":"index.js.map","sourceRoot":"../"}
+{"mappings":"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","sources":["taqueria-plugin-taquito/index.ts","taqueria-plugin-taquito/originate.ts"],"sourcesContent":["import {Plugin, Task} from '@taqueria/node-sdk'\nimport type { i18n} from '@taqueria/node-sdk/types'\nimport originate from './originate'\n\nPlugin.create((i18n: i18n) => ({\n    alias: \"taquito\",\n    schema: \"1.0\",\n    version: \"0.1\",\n    tasks: [\n        Task.create({\n            task: \"deploy\",\n            command: \"deploy [contract]\",\n            description: \"Deploy a smart contract to a particular environment\",\n            options: [\n            ],\n            aliases: [\"originate\"],\n            handler: \"proxy\",\n            encoding: \"application/json\"\n        }),\n    ],\n    proxy: originate\n}), process.argv)\n","import { SanitizedArgs, PluginResponse, AccountDetails, Failure, LikeAPromise, Config, NetworkConfig, SandboxConfig, EnvironmentConfig} from \"@taqueria/node-sdk/types\";\nimport glob from 'fast-glob'\nimport {join} from 'path'\nimport { TezosToolkit, OriginateParams, WalletOperationBatch } from '@taquito/taquito';\nimport {readFile} from 'fs/promises'\nimport { InMemorySigner, importKey } from '@taquito/signer';\nimport { sendAsyncJsonRes, getCurrentEnvironmentConfig, getNetworkConfig, getSandboxAccountConfig, getInitialStorage, sendErr, getSandboxConfig, getDefaultAccount, sendJsonRes, sendAsyncErr } from \"@taqueria/node-sdk\";\nimport { BatchWalletOperation } from \"@taquito/taquito/dist/types/wallet/batch-operation\";\nimport { OperationContentsAndResultOrigination } from \"@taquito/rpc\";\n\ntype Opts = SanitizedArgs & Record<string, unknown>\n\ninterface ContractStorageMapping {\n    filename: string,\n    storage?: unknown\n}\n\ninterface OriginationResult {\n    contract: string\n    address: string\n    destination: string\n}\n\nconst getContractAbspath = (contractFilename: string, parsedArgs: Opts) => \n    join(parsedArgs.artifactsDir, /\\.tz$/.test(contractFilename) ? contractFilename : `${contractFilename}.tz`)\n\nconst addOrigination = (parsedArgs: Opts, batch: Promise<WalletOperationBatch>) => async (mapping: ContractStorageMapping) => {\n    const contractAbspath = getContractAbspath(mapping.filename, parsedArgs)\n    const contractData = await readFile(contractAbspath, \"utf-8\")\n    return (await batch).withOrigination({\n        code: contractData,\n        storage: mapping.storage,\n        \n    })\n}\n\nconst getValidContracts = async (parsedArgs: Opts) => {\n    const contracts = parsedArgs.contract\n        ? [parsedArgs.contract as string]\n        : (await glob(\"**/*.tz\", {cwd: parsedArgs.artifactsDir})) as string[]    \n\n    return contracts.reduce(\n        (retval, filename) => {\n            const storage = getInitialStorage(parsedArgs) (filename)\n            if (!storage) throw(`No initial storage provided for ${filename}`)\n            return [...retval, {filename, storage}]\n        },\n        [] as ContractStorageMapping[]\n    )    \n}\n\nconst mapOpToContract = async (contracts: ContractStorageMapping[], op: BatchWalletOperation, destination: string) => {\n    debugger\n    const results = await op.operationResults()\n\n    return contracts.reduce(\n        (retval, contract) => {\n\n            // If initial storage was provided for the contract\n            // then we submitted an operation to originate that contract\n            if (contract.storage) {\n                const result = results.pop() as OperationContentsAndResultOrigination\n                const address = result && result.metadata.operation_result.originated_contracts\n                    ? result.metadata.operation_result.originated_contracts.join(',')\n                    : 'Error'\n\n                return [\n                    ...retval, {\n                        contract: contract.filename,\n                        address,\n                        destination\n                    }\n                ]\n            }\n\n            return [\n                ...retval, {\n                    contract: contract.filename,\n                    address: \"Error\",\n                    destination\n                }\n            ]\n        },\n        [] as OriginationResult[]\n    )\n}\n\n\nconst createBatch = async (parsedArgs: Opts, tezos: TezosToolkit, destination: string) => {\n    const contracts = await getValidContracts (parsedArgs)                                \n    \n    const batch = await contracts.reduce(\n        (batch, contractMapping) => \n            contractMapping.storage\n                ? addOrigination(parsedArgs, batch) (contractMapping)\n                : batch,\n        Promise.resolve(tezos.wallet.batch())\n    )\n    \n    try {\n        const op = await batch.send()\n        const confirmed = await op.confirmation()\n        return await mapOpToContract(contracts, op, destination)\n    }\n    catch (err) {\n        const error = (err as {message: string})\n        if (error.message) sendErr(error.message)\n        return undefined\n    }\n}\n\nconst originateToNetworks = (parsedArgs: Opts, currentEnv: EnvironmentConfig) =>\n    currentEnv.networks\n        ? currentEnv.networks.reduce(\n            (retval, networkName) => {\n                const network = getNetworkConfig (parsedArgs) (networkName)\n                if (network.rpcUrl) {\n                    if (network.faucet) {\n                        const result = (async () => {\n                            const tezos = new TezosToolkit(network.rpcUrl as string)\n                            await importKey(tezos, network.faucet.email, network.faucet.password, network.faucet.mnemonic.join(' '), network.faucet.activation_code)\n                            return await createBatch(parsedArgs, tezos, networkName)\n                        })()\n\n                        return [...retval, result]\n                    }\n                    else sendErr(`Network ${networkName} requires a valid faucet in config.json.`)\n                }\n                else sendErr(`Network \"${networkName} is missing an RPC url in config.json.\"`)\n                return retval\n            },\n            [] as  Promise<OriginationResult[]|undefined>[]\n        )\n        : []\n\nconst originateToSandboxes = (parsedArgs: Opts, currentEnv: EnvironmentConfig) =>\n    currentEnv.sandboxes\n        ? currentEnv.sandboxes.reduce(\n            (retval, sandboxName) => {\n                const sandbox = getSandboxConfig (parsedArgs) (sandboxName)\n                if (sandbox.rpcUrl) {\n                    const secretKey = getDefaultAccount(parsedArgs) (sandboxName) ?.keys?.secretKey\n                    if (secretKey) {\n                        const result = (async () => {\n                            const tezos = new TezosToolkit(sandbox.rpcUrl as string)\n                            tezos.setProvider({\n                                signer: new InMemorySigner(secretKey.replace(/^unencrypted:/, '')),\n                            });\n                            return await createBatch(parsedArgs, tezos, sandboxName)\n                        })()\n                        \n                        return [...retval, result]\n                    }\n                    else sendErr(`Sandbox ${sandboxName}'s default account is missing keys in config.json.`)\n                }\n                else sendErr(`Sandbox \"${sandboxName} is missing an RPC url in config.json.\"`)\n\n                return retval\n            },\n            [] as Promise<OriginationResult[]|undefined>[]\n        )\n        : []\n    \n    \n\nexport const originate = <T>(parsedArgs: Opts): LikeAPromise<PluginResponse, Failure<T>> => {\n    const env = getCurrentEnvironmentConfig(parsedArgs)\n\n    if (!env) {\n        return sendAsyncErr(`There is no environment called ${parsedArgs.env} in your config.json.`)\n    }\n\n    const jobs = [\n        ...originateToNetworks(parsedArgs, env),\n        ...originateToSandboxes(parsedArgs, env)\n    ]\n\n    return Promise.all(jobs)\n        .then(jobs => jobs.reduce(\n            (retval, originations) => {\n                return originations\n                    ? [...retval as OriginationResult[], ...originations]\n                    : retval\n            },\n            []\n        ))\n        .then(results => results && results.length > 0 ? sendJsonRes(results): sendErr(`No contracts originated.`))\n}\n\nexport default originate\n"],"names":[],"version":3,"file":"index.js.map","sourceRoot":"../"}

package/index.ts

@@ -1,4 +1,4 @@
-import {Plugin, Task, EconomicalProtocol} from '@taqueria/node-sdk'
+import {Plugin, Task} from '@taqueria/node-sdk'
 import type { i18n} from '@taqueria/node-sdk/types'
 import originate from './originate'
 

package/originate.ts

@@ -1,13 +1,20 @@
-import { SanitizedArgs, PluginResponse, AccountDetails, Failure, LikeAPromise, Config, NetworkConfig, SandboxConfig} from "@taqueria/node-sdk/types";
+import { SanitizedArgs, PluginResponse, AccountDetails, Failure, LikeAPromise, Config, NetworkConfig, SandboxConfig, EnvironmentConfig} from "@taqueria/node-sdk/types";
 import glob from 'fast-glob'
 import {join} from 'path'
-import { TezosToolkit } from '@taquito/taquito';
+import { TezosToolkit, OriginateParams, WalletOperationBatch } from '@taquito/taquito';
 import {readFile} from 'fs/promises'
 import { InMemorySigner, importKey } from '@taquito/signer';
-import { sendAsyncJsonRes } from "@taqueria/node-sdk";
+import { sendAsyncJsonRes, getCurrentEnvironmentConfig, getNetworkConfig, getSandboxAccountConfig, getInitialStorage, sendErr, getSandboxConfig, getDefaultAccount, sendJsonRes, sendAsyncErr } from "@taqueria/node-sdk";
+import { BatchWalletOperation } from "@taquito/taquito/dist/types/wallet/batch-operation";
+import { OperationContentsAndResultOrigination } from "@taquito/rpc";
 
 type Opts = SanitizedArgs & Record<string, unknown>
 
+interface ContractStorageMapping {
+    filename: string,
+    storage?: unknown
+}
+
 interface OriginationResult {
     contract: string
     address: string
@@ -17,185 +24,167 @@ interface OriginationResult {
 const getContractAbspath = (contractFilename: string, parsedArgs: Opts) => 
     join(parsedArgs.artifactsDir, /\.tz$/.test(contractFilename) ? contractFilename : `${contractFilename}.tz`)
 
+const addOrigination = (parsedArgs: Opts, batch: Promise<WalletOperationBatch>) => async (mapping: ContractStorageMapping) => {
+    const contractAbspath = getContractAbspath(mapping.filename, parsedArgs)
+    const contractData = await readFile(contractAbspath, "utf-8")
+    return (await batch).withOrigination({
+        code: contractData,
+        storage: mapping.storage,
+        
+    })
+}
 
-const originateContractToSandbox = async (contractFilename: string, parsedArgs: Opts, storage: unknown, sandboxName: string, sandbox: SandboxConfig | undefined): LikeAPromise<OriginationResult, Failure<unknown>> => {
-    try {
-        if (sandbox && sandbox.rpcUrl) {
-            const contractAbspath = getContractAbspath(contractFilename, parsedArgs)
-            const tezos = new TezosToolkit(sandbox.rpcUrl)
-            const secretKey = getAccountSecretKey(sandbox)
-            if (secretKey) {
-                tezos.setProvider({
-                    signer: new InMemorySigner(secretKey),
-                });
-
-                const contractData = await readFile(contractAbspath, "utf-8")
-                return tezos.contract.originate({
-                    code: contractData,
-                    storage: storage
-                })
-                .then(operation => ({
-                    contract: contractFilename,
-                    address: operation.contractAddress as string,
-                    destination: sandboxName
-                }))
-                .catch(previous => Promise.reject({
-                    errCode: "E_ORIGINATE",
-                    errMsg: `Could not originate ${contractFilename} on the sandbox '${sandboxName}'`,
-                    previous
-                }))
-            }
-            else {
-                return Promise.reject({
-                    errCode: "E_INVALID_SANDBOX_ACCOUNT",
-                    errMsg: `Please configure a default account for the ${sandboxName} to be used for origination.`,
-                    context: sandbox
-                })
-            }
-        }
-        return Promise.reject({
-            errCode: "E_INVALID_SANDBOX_URL",
-            errMsg: 'The sandbox configuration is invalid and missing the RPC url',
-            context: sandbox
-        })
-    }
-    catch (err) {
-        return Promise.reject({
-            errCode: "E_ORIGINATE",
-            errMsg: "An unexpected error occured when trying to originate a contract",
-            previous: err
-        })
-    }
+const getValidContracts = async (parsedArgs: Opts) => {
+    const contracts = parsedArgs.contract
+        ? [parsedArgs.contract as string]
+        : (await glob("**/*.tz", {cwd: parsedArgs.artifactsDir})) as string[]    
+
+    return contracts.reduce(
+        (retval, filename) => {
+            const storage = getInitialStorage(parsedArgs) (filename)
+            if (!storage) throw(`No initial storage provided for ${filename}`)
+            return [...retval, {filename, storage}]
+        },
+        [] as ContractStorageMapping[]
+    )    
 }
 
-const originateContractToNetwork = async (contractFilename: string, parsedArgs: Opts, storage: unknown, networkName: string, network: NetworkConfig|undefined): LikeAPromise<OriginationResult, Failure<unknown>> => {
-    try {
-        if (network && network.rpcUrl) {
-            const contractAbspath = getContractAbspath(contractFilename, parsedArgs)
-            const tezos = new TezosToolkit(network.rpcUrl)
-            if (network.faucet) {
-                await importKey(tezos, network.faucet.email, network.faucet.password, network.faucet.mnemonic.join(' '), network.faucet.activation_code)
-
-                const contractData = await readFile(contractAbspath, "utf-8")
-                return tezos.contract.originate({
-                    code: contractData,
-                    storage: storage
-                })
-                .then(operation => ({
-                    contract: contractFilename,
-                    address: operation.contractAddress as string,
-                    destination: networkName
-                }))
-                .catch(previous => Promise.reject({
-                    errCode: "E_ORIGINATE",
-                    errMsg: `Could not originate ${contractFilename} on the network '${networkName}'`,
-                    previous
-                }))
-            }
-            else {
-                return Promise.reject({
-                    errCode: "E_INVALID_NETWORK_FAUCET",
-                    errMsg: `Please configure a faucet for the ${network} network to be used for origination.`,
-                    context: network
-                })
+const mapOpToContract = async (contracts: ContractStorageMapping[], op: BatchWalletOperation, destination: string) => {
+    debugger
+    const results = await op.operationResults()
+
+    return contracts.reduce(
+        (retval, contract) => {
+
+            // If initial storage was provided for the contract
+            // then we submitted an operation to originate that contract
+            if (contract.storage) {
+                const result = results.pop() as OperationContentsAndResultOrigination
+                const address = result && result.metadata.operation_result.originated_contracts
+                    ? result.metadata.operation_result.originated_contracts.join(',')
+                    : 'Error'
+
+                return [
+                    ...retval, {
+                        contract: contract.filename,
+                        address,
+                        destination
+                    }
+                ]
             }
-        }
-        return Promise.reject({
-            errCode: "E_INVALID_NETWORK_URL",
-            errMsg: 'The network configuration is invalid and missing the RPC url',
-            context: network
-        })
-    }
-    catch (err) {
-        return Promise.reject({
-            errCode: "E_ORIGINATE",
-            errMsg: "An unexpected error occured when trying to originate a contract",
-            previous: err
-        })
-    }
-}
 
-const getNetworkConfig = (networkName: string, config: Config) => {
-    return !config.network[networkName]
-        ? undefined
-        : config.network[networkName]
+            return [
+                ...retval, {
+                    contract: contract.filename,
+                    address: "Error",
+                    destination
+                }
+            ]
+        },
+        [] as OriginationResult[]
+    )
 }
 
-const getSandboxConfig = (sandboxName: string, config: Config) => {
-    return !config.sandbox[sandboxName]
-    ? undefined
-    : config.sandbox[sandboxName]
-}
 
-const getAccountSecretKey = (sandbox: SandboxConfig) => {
-    if (sandbox.accounts && sandbox.accounts.default) {
-        const accountName = (sandbox.accounts.default as string);
-        const accountDetails = sandbox.accounts[accountName] as AccountDetails
-        if (accountDetails.keys) return accountDetails.keys.secretKey.replace(/unencrypted:/, '')
+const createBatch = async (parsedArgs: Opts, tezos: TezosToolkit, destination: string) => {
+    const contracts = await getValidContracts (parsedArgs)                                
+    
+    const batch = await contracts.reduce(
+        (batch, contractMapping) => 
+            contractMapping.storage
+                ? addOrigination(parsedArgs, batch) (contractMapping)
+                : batch,
+        Promise.resolve(tezos.wallet.batch())
+    )
+    
+    try {
+        const op = await batch.send()
+        const confirmed = await op.confirmation()
+        return await mapOpToContract(contracts, op, destination)
+    }
+    catch (err) {
+        const error = (err as {message: string})
+        if (error.message) sendErr(error.message)
+        return undefined
     }
-
-    return undefined        
 }
 
-const originateContract = (parsedArgs: Opts) => (contractFilename: string) => {
-    // TODO: Should getting the default environment be provided by the SDK or the framework?
-    const currentEnv = parsedArgs.env
-        ? (parsedArgs.env as string)
-        : (
-            parsedArgs.config.environment
-                ? parsedArgs.config.environment.default
-                : 'development'
+const originateToNetworks = (parsedArgs: Opts, currentEnv: EnvironmentConfig) =>
+    currentEnv.networks
+        ? currentEnv.networks.reduce(
+            (retval, networkName) => {
+                const network = getNetworkConfig (parsedArgs) (networkName)
+                if (network.rpcUrl) {
+                    if (network.faucet) {
+                        const result = (async () => {
+                            const tezos = new TezosToolkit(network.rpcUrl as string)
+                            await importKey(tezos, network.faucet.email, network.faucet.password, network.faucet.mnemonic.join(' '), network.faucet.activation_code)
+                            return await createBatch(parsedArgs, tezos, networkName)
+                        })()
+
+                        return [...retval, result]
+                    }
+                    else sendErr(`Network ${networkName} requires a valid faucet in config.json.`)
+                }
+                else sendErr(`Network "${networkName} is missing an RPC url in config.json."`)
+                return retval
+            },
+            [] as  Promise<OriginationResult[]|undefined>[]
+        )
+        : []
+
+const originateToSandboxes = (parsedArgs: Opts, currentEnv: EnvironmentConfig) =>
+    currentEnv.sandboxes
+        ? currentEnv.sandboxes.reduce(
+            (retval, sandboxName) => {
+                const sandbox = getSandboxConfig (parsedArgs) (sandboxName)
+                if (sandbox.rpcUrl) {
+                    const secretKey = getDefaultAccount(parsedArgs) (sandboxName) ?.keys?.secretKey
+                    if (secretKey) {
+                        const result = (async () => {
+                            const tezos = new TezosToolkit(sandbox.rpcUrl as string)
+                            tezos.setProvider({
+                                signer: new InMemorySigner(secretKey.replace(/^unencrypted:/, '')),
+                            });
+                            return await createBatch(parsedArgs, tezos, sandboxName)
+                        })()
+                        
+                        return [...retval, result]
+                    }
+                    else sendErr(`Sandbox ${sandboxName}'s default account is missing keys in config.json.`)
+                }
+                else sendErr(`Sandbox "${sandboxName} is missing an RPC url in config.json."`)
+
+                return retval
+            },
+            [] as Promise<OriginationResult[]|undefined>[]
         )
-    const env = parsedArgs.config.environment && parsedArgs.config.environment[currentEnv]
-            ? parsedArgs.config.environment[currentEnv]
-            : undefined
+        : []
+    
+    
 
-    if (!env) {
-        return Promise.reject({
-            errCode: "E_INVALID_ENV",
-            errMsg: `No environment configured in your configuration file called ${parsedArgs.env}`,
-            context: parsedArgs.config
-        })    
-    }
+export const originate = <T>(parsedArgs: Opts): LikeAPromise<PluginResponse, Failure<T>> => {
+    const env = getCurrentEnvironmentConfig(parsedArgs)
 
-    if (!env.storage || !env.storage[contractFilename]) {
-        return Promise.reject({
-            errCode: "E_INVALID_STORAGE",
-            errMsg: `No storage configured in your configuration file for ${contractFilename}`,
-            context: env
-        })
+    if (!env) {
+        return sendAsyncErr(`There is no environment called ${parsedArgs.env} in your config.json.`)
     }
 
-    const networkProcesses = !env.networks ? [] : env.networks.reduce(
-        (retval: LikeAPromise<OriginationResult, Failure<unknown>>[], network) => 
-            getNetworkConfig(network, parsedArgs.config)
-                ? [...retval, originateContractToNetwork(contractFilename, parsedArgs, env.storage[contractFilename], network, getNetworkConfig(network, parsedArgs.config))]
-                : retval,
-        []
-    )
-
-    const allProcesses = !env.sandboxes ? [] : env.sandboxes.reduce(
-        (retval: LikeAPromise<OriginationResult, Failure<unknown>>[], sandbox) => getSandboxConfig(sandbox, parsedArgs.config)
-            ? [...retval, originateContractToSandbox(contractFilename, parsedArgs, env.storage[contractFilename], sandbox, getSandboxConfig(sandbox, parsedArgs.config))]
-            : retval            
-        ,
-        networkProcesses
-    )
-            
-    return Promise.all(allProcesses)
-}
-
-const originateAll = (parsedArgs: Opts) =>
-    glob("**/*.tz", {cwd: parsedArgs.artifactsDir})
-    .then(files => Promise.all(files.map(originateContract(parsedArgs))))
-    .then(results => results.flat(1))
-
-export const originate = <T>(parsedArgs: Opts): LikeAPromise<PluginResponse, Failure<T>> => {
-    const p = parsedArgs.contract
-        ? originateContract(parsedArgs) (parsedArgs.contract as string)
-        : originateAll(parsedArgs)
-
-    return p.then(sendAsyncJsonRes)
+    const jobs = [
+        ...originateToNetworks(parsedArgs, env),
+        ...originateToSandboxes(parsedArgs, env)
+    ]
+
+    return Promise.all(jobs)
+        .then(jobs => jobs.reduce(
+            (retval, originations) => {
+                return originations
+                    ? [...retval as OriginationResult[], ...originations]
+                    : retval
+            },
+            []
+        ))
+        .then(results => results && results.length > 0 ? sendJsonRes(results): sendErr(`No contracts originated.`))
 }
 
-export default originate
+export default originate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taqueria/plugin-taquito",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "A taqueria plugin for originating smart contracts using Taquito",
   "targets": {
     "default": {
@@ -13,7 +13,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "pluginInfo": "npx ts-node index.ts --taqRun pluginInfo --i18n {\"foo:\"\"bar\"}",
-    "build": "npx parcel build --no-cache 2>&1",
+    "build": "npx tsc -noEmit && npx parcel build --no-cache 2>&1",
     "debugPluginInfo": "node --inspect-brk index.js --taqRun pluginInfo --i18n {\"foo:\"\"bar\"}"
   },
   "keywords": [
@@ -42,13 +42,13 @@
   },
   "homepage": "https://github.com/ecadlabs/taqueria#readme",
   "devDependencies": {
-    "parcel": "^2.0.1",
+    "parcel": "^2.4.0",
     "typescript": "4.5.4"
   },
   "dependencies": {
-    "@taquito/signer": "^11.1.0",
-    "@taquito/taquito": "^11.0.2",
-    "fast-glob": "^3.2.10",
-    "@taqueria/node-sdk": "^0.2.0"
+    "@taqueria/node-sdk": "^0.3.1",
+    "@taquito/signer": "^12.1.0",
+    "@taquito/taquito": "^12.1.0",
+    "fast-glob": "^3.2.10"
   }
 }

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "ES2019",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2021",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */