@taqueria/plugin-taquito 0.22.2 → 0.23.0-rc.2

package/index.js

@@ -1,9 +1,9 @@
 var $iVZbm$taquerianodesdk = require("@taqueria/node-sdk");
 var $iVZbm$taquitosigner = require("@taquito/signer");
 var $iVZbm$taquitotaquito = require("@taquito/taquito");
+var $iVZbm$taquitomichelcodec = require("@taquito/michel-codec");
 var $iVZbm$fspromises = require("fs/promises");
 var $iVZbm$path = require("path");
-var $iVZbm$taquitomichelcodec = require("@taquito/michel-codec");
 
 
 
@@ -11,295 +11,321 @@ var $iVZbm$taquitomichelcodec = require("@taquito/michel-codec");
 
 
 
-
-const $806c5c6032403442$var$getFirstAccountAlias = (sandboxName, opts)=>{
-    const aliases = (0, $iVZbm$taquerianodesdk.getSandboxAccountNames)(opts)(sandboxName);
-    return aliases.shift();
-};
-const $806c5c6032403442$var$getContractAbspath = (contractFilename, parsedArgs)=>(0, $iVZbm$path.join)(parsedArgs.config.artifactsDir, /\.tz$/.test(contractFilename) ? contractFilename : `${contractFilename}.tz`);
-const $806c5c6032403442$var$addOrigination = (parsedArgs, batch)=>async (mapping)=>{
-        const contractAbspath = $806c5c6032403442$var$getContractAbspath(mapping.filename, parsedArgs);
-        const contractData = await (0, $iVZbm$fspromises.readFile)(contractAbspath, "utf-8");
-        return (await batch).withOrigination({
-            code: contractData,
-            init: mapping.storage
-        });
-    };
-const $806c5c6032403442$var$getDefaultStorageFilename = (contractName)=>{
-    const baseFilename = (0, $iVZbm$path.basename)(contractName, (0, $iVZbm$path.extname)(contractName));
-    const extFilename = (0, $iVZbm$path.extname)(contractName);
-    const defaultStorage = `${baseFilename}.default_storage${extFilename}`;
-    return defaultStorage;
-};
-// TODO: temporary quick solution. May refactor this to only deal with one contract later
-const $806c5c6032403442$var$getValidContracts = async (parsedArgs)=>{
-    const contracts = [
-        parsedArgs.contract
-    ];
-    const storageFilename = parsedArgs.storage ?? $806c5c6032403442$var$getDefaultStorageFilename(contracts[0]);
-    return contracts.reduce(async (retval, filename)=>{
-        const storage = await (0, $iVZbm$taquerianodesdk.newGetInitialStorage)(parsedArgs, storageFilename);
-        if (storage === undefined || storage === null) {
-            (0, $iVZbm$taquerianodesdk.sendErr)(`❌ No initial storage file was found for ${filename}\nStorage must be specified in a file as a Michelson expression and will automatically be linked to this contract if specified with the name "${$806c5c6032403442$var$getDefaultStorageFilename(contracts[0])}" in the artifacts directory\nYou can also manually pass a storage file to the deploy task using the --storage STORAGE_FILE_NAME option\n`);
-            // sendErr(
-            // 	`Michelson artifact ${filename} has no initial storage specified for the target environment.\nStorage is expected to be specified in .taq/config.json at JSON path: environment.${
-            // 		getCurrentEnvironment(parsedArgs)
-            // 	}.storage["${filename}"]\nThe value of the above JSON key should be the name of the file (absolute path or relative path with respect to the root of the Taqueria project) that contains the actual value of the storage, as a Michelson expression.\n`,
-            // );
-            return retval;
-        }
-        return [
-            ...await retval,
-            {
-                filename: filename,
-                storage: storage
-            }
-        ];
-    }, Promise.resolve([]));
-};
-const $806c5c6032403442$var$mapOpToContract = async (parsedArgs, contracts, op, destination)=>{
-    const results = await op.operationResults();
-    const originationResults = results.filter((result)=>result.kind === "origination").map((result)=>result);
-    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) {
-            // WARNING - using side effect here.
-            // For each iteration of reduce, results array is being modified-in-place.
-            // TODO: Adjust to use recursion to avoid side-effect.
-            const result = originationResults.shift();
-            const address = result && result.metadata.operation_result.originated_contracts ? result.metadata.operation_result.originated_contracts.join(",") : "Error";
-            const alias = parsedArgs.alias ?? (0, $iVZbm$path.basename)(contract.filename, (0, $iVZbm$path.extname)(contract.filename));
-            if (address !== "Error") (0, $iVZbm$taquerianodesdk.updateAddressAlias)(parsedArgs, alias, address);
-            return [
-                ...retval,
-                {
-                    contract: contract.filename,
-                    address: address,
-                    alias: address !== "Error" ? alias : "N/A",
-                    destination: destination
-                }, 
-            ];
-        }
-        return [
-            ...retval,
-            {
-                contract: contract.filename,
-                address: "Error",
-                alias: "N/A",
-                destination: destination
-            }, 
-        ];
-    }, []);
-};
-const $806c5c6032403442$var$createBatch = async (parsedArgs, tezos, destination)=>{
-    const contracts = await $806c5c6032403442$var$getValidContracts(parsedArgs);
-    if (!contracts.length) return undefined;
-    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(parsedArgs, contracts, op, destination);
-    } catch (err) {
-        const error = err;
-        if (error.message) {
-            const msg = error.message;
-            if (/ENOTFOUND/.test(msg)) (0, $iVZbm$taquerianodesdk.sendErr)(msg + " - The RPC URL may be invalid. Check ./taq/config.json.\n");
-            else if (/ECONNREFUSED/.test(msg)) (0, $iVZbm$taquerianodesdk.sendErr)(msg + " - The RPC URL may be down or the sandbox is not running.");
-            else if (/empty_implicit_contract/.test(msg)) {
-                const result = msg.match(/(?<="implicit":")tz[^"]+(?=")/);
-                const publicKeyHash = result ? result[0] : undefined;
-                if (!publicKeyHash) (0, $iVZbm$taquerianodesdk.sendErr)(msg);
-                else (0, $iVZbm$taquerianodesdk.sendErr)(`The account ${publicKeyHash} for the target environment, "${(0, $iVZbm$taquerianodesdk.getCurrentEnvironment)(parsedArgs)}", may not be funded\nTo fund this account:\n1. Go to https://teztnets.xyz and click "Faucet" of the target testnet\n2. Copy and paste the above key into the 'wallet address field\n3. Request some Tez (Note that you might need to wait for a few seconds for the network to register the funds)`);
-            } else (0, $iVZbm$taquerianodesdk.sendErr)(msg + " - There was a problem communicating with the chain. Check the RPC URL of the network or sandbox you're targeting in config.json.\n");
-        }
-        return undefined;
-    }
-};
-async function $806c5c6032403442$export$e4c4fcd791db1d6b(toolkit, privateKeyOrEmail, passphrase, mnemonic, secret) {
-    if (privateKeyOrEmail && passphrase && mnemonic && secret) return await (0, $iVZbm$taquitosigner.importKey)(toolkit, privateKeyOrEmail, passphrase, mnemonic, secret);
-    else if (mnemonic) {
-        const signer = (0, $iVZbm$taquitosigner.InMemorySigner).fromFundraiser(privateKeyOrEmail ?? "", passphrase ?? "", mnemonic);
-        toolkit.setProvider({
-            signer: signer
-        });
-        const pkh = await signer.publicKeyHash();
-        let op;
-        try {
-            op = await toolkit.tz.activate(pkh, secret ?? "");
-            if (op) await op.confirmation();
-        } catch (ex) {}
-    } else if (privateKeyOrEmail) {
-        // Fallback to regular import
-        const signer = await (0, $iVZbm$taquitosigner.InMemorySigner).fromSecretKey(privateKeyOrEmail, passphrase);
-        toolkit.setProvider({
-            signer: signer
-        });
-    }
-}
-const $806c5c6032403442$var$originateToNetworks = (parsedArgs, currentEnv)=>currentEnv.networks ? currentEnv.networks.reduce((retval, networkName)=>{
+const $2c87226370e1ba97$export$e1210318d02974b = (parsedArgs, env)=>{
+    const targetConstraintErrMsg = "Each environment can only have one target, be it a network or a sandbox";
+    if (env.networks?.length === 1 && env.sandboxes?.length === 1) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(targetConstraintErrMsg);
+    if (env.networks?.length === 1) {
+        const networkName = env.networks[0];
         const network = (0, $iVZbm$taquerianodesdk.getNetworkConfig)(parsedArgs)(networkName);
-        if (network) {
-            if (network.rpcUrl) {
-                const result = (async ()=>{
-                    const tezos = new (0, $iVZbm$taquitotaquito.TezosToolkit)(network.rpcUrl);
-                    const key = await (0, $iVZbm$taquerianodesdk.getAccountPrivateKey)(parsedArgs, network, "taqRootAccount");
-                    await (0, $iVZbm$taquitosigner.importKey)(tezos, key);
-                    return await $806c5c6032403442$var$createBatch(parsedArgs, tezos, networkName);
-                })();
-                return [
-                    ...retval,
-                    result
-                ];
-            } else (0, $iVZbm$taquerianodesdk.sendErr)(`Network "${networkName}" is missing an RPC url in config.json.`);
-        } else (0, $iVZbm$taquerianodesdk.sendErr)(`The current environment is configured to use a network called '${networkName}'; however, no network of this name has been configured in .taq/config.json.`);
-        return retval;
-    }, []) : [];
-const $806c5c6032403442$var$originateToSandboxes = (parsedArgs, currentEnv)=>currentEnv.sandboxes ? currentEnv.sandboxes.reduce((retval, sandboxName)=>{
+        if (!network) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`The current environment is configured to use a network called '${networkName}'; however, no network of this name has been configured in .taq/config.json`);
+        return Promise.resolve([
+            "Network",
+            network
+        ]);
+    }
+    if (env.sandboxes?.length === 1) {
+        const sandboxName = env.sandboxes[0];
         const sandbox = (0, $iVZbm$taquerianodesdk.getSandboxConfig)(parsedArgs)(sandboxName);
-        if (sandbox) {
-            if (sandbox.rpcUrl) {
-                let defaultAccount = (0, $iVZbm$taquerianodesdk.getDefaultAccount)(parsedArgs)(sandboxName);
-                if (!defaultAccount) {
-                    const first = $806c5c6032403442$var$getFirstAccountAlias(sandboxName, parsedArgs);
-                    if (first) {
-                        defaultAccount = (0, $iVZbm$taquerianodesdk.getSandboxAccountConfig)(parsedArgs)(sandboxName)(first);
-                        // TODO: The error should be a warning, not an error. Descriptive string should not begin with 'Warning:'
-                        (0, $iVZbm$taquerianodesdk.sendErr)(`Warning: A default origination account has not been specified for sandbox ${sandboxName}. Taqueria will use the account ${first} for this origination.\nA default account can be specified in .taq/config.json at JSON path: sandbox.${sandboxName}.accounts.default\n`);
-                    }
-                }
-                if (defaultAccount) {
-                    const secretKey = defaultAccount.secretKey;
-                    const result = (async ()=>{
-                        const tezos = new (0, $iVZbm$taquitotaquito.TezosToolkit)(sandbox.rpcUrl);
-                        tezos.setProvider({
-                            signer: new (0, $iVZbm$taquitosigner.InMemorySigner)(secretKey.replace(/^unencrypted:/, ""))
-                        });
-                        return await $806c5c6032403442$var$createBatch(parsedArgs, tezos, sandboxName);
-                    })();
-                    return [
-                        ...retval,
-                        result
-                    ];
-                } else (0, $iVZbm$taquerianodesdk.sendErr)(`No accounts are available for the sandbox called ${sandboxName} to perform origination.`);
-            } else (0, $iVZbm$taquerianodesdk.sendErr)(`Sandbox "${sandboxName} is missing an RPC url in config.json."`);
-        } else (0, $iVZbm$taquerianodesdk.sendErr)(`The current environment is configured to use a sandbox called '${sandboxName}'; however, no sandbox of this name has been configured in .taq/config.json.`);
-        return retval;
-    }, []) : [];
-const $806c5c6032403442$export$acf571c34911f824 = (parsedArgs)=>{
-    const env = (0, $iVZbm$taquerianodesdk.getCurrentEnvironmentConfig)(parsedArgs);
-    if (!env) return (0, $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 ? (0, $iVZbm$taquerianodesdk.sendJsonRes)(results) : (0, $iVZbm$taquerianodesdk.sendErr)(`No contracts originated.`));
-};
-var $806c5c6032403442$export$2e2bcd8739ae039 = $806c5c6032403442$export$acf571c34911f824;
-
-
-
-
-
-
-const $944e64d99e99b46e$var$getFirstAccountAlias = (sandboxName, opts)=>{
-    const aliases = (0, $iVZbm$taquerianodesdk.getSandboxAccountNames)(opts)(sandboxName);
-    return aliases.shift();
+        if (!sandbox) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`The current environment is configured to use a sandbox called '${sandboxName}'; however, no sandbox of this name has been configured in .taq/config.json`);
+        return Promise.resolve([
+            "Sandbox",
+            sandbox
+        ]);
+    }
+    return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(targetConstraintErrMsg);
 };
-const $944e64d99e99b46e$var$configureToolKitWithSandbox = async (parsedArgs, sandboxName)=>{
-    const sandbox = (0, $iVZbm$taquerianodesdk.getSandboxConfig)(parsedArgs)(sandboxName);
-    if (!sandbox) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`The current environment is configured to use a sandbox called '${sandboxName}'; however, no sandbox of this name has been configured in .taq/config.json.`);
-    let defaultAccount = (0, $iVZbm$taquerianodesdk.getDefaultAccount)(parsedArgs)(sandboxName);
-    if (!defaultAccount) {
-        const first = $944e64d99e99b46e$var$getFirstAccountAlias(sandboxName, parsedArgs);
-        if (first) {
-            defaultAccount = (0, $iVZbm$taquerianodesdk.getSandboxAccountConfig)(parsedArgs)(sandboxName)(first);
-            (0, $iVZbm$taquerianodesdk.sendErr)(`Warning: A default account has not been specified for sandbox ${sandboxName}. Taqueria will use the account ${first} for this operation.\nA default account can be specified in .taq/config.json at JSON path: sandbox.${sandboxName}.accounts.default\n`);
-        }
+const $2c87226370e1ba97$export$cf995f4bdbe82fd9 = async (sandbox, sender)=>{
+    let accountKey;
+    if (sender && sender !== "default") {
+        const accounts = $2c87226370e1ba97$export$f9fd6b8c665ab918(sandbox);
+        if (accounts.hasOwnProperty(sender)) accountKey = accounts[sender].secretKey;
+        else return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`${sender} is not an account instantiated in the current environment. Check .taq/config.json`);
+    } else {
+        const defaultAccount = (0, $iVZbm$taquerianodesdk.getDefaultSandboxAccount)(sandbox);
+        if (!defaultAccount) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`No default account is specified in the sandbox to perform the operation. Please use the --sender flag to explicitly specify the account to use as the sender of the operation`);
+        accountKey = defaultAccount.secretKey;
     }
-    if (!defaultAccount) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`No accounts are available for the sandbox called ${sandboxName} to perform the operation.`);
     const tezos = new (0, $iVZbm$taquitotaquito.TezosToolkit)(sandbox.rpcUrl);
     tezos.setProvider({
-        signer: new (0, $iVZbm$taquitosigner.InMemorySigner)(defaultAccount.secretKey.replace(/^unencrypted:/, ""))
+        signer: new (0, $iVZbm$taquitosigner.InMemorySigner)(accountKey.replace(/^unencrypted:/, ""))
     });
     return tezos;
 };
-const $944e64d99e99b46e$var$configureToolKitWithNetwork = async (parsedArgs, networkName)=>{
-    const network = (0, $iVZbm$taquerianodesdk.getNetworkConfig)(parsedArgs)(networkName);
-    if (!network) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`The current environment is configured to use a network called '${networkName}'; however, no network of this name has been configured in .taq/config.json.`);
+const $2c87226370e1ba97$export$5a1c5b7c3009d1b0 = async (parsedArgs, network, sender)=>{
+    let account;
+    if (sender && sender !== (0, $iVZbm$taquerianodesdk.TAQ_OPERATOR_ACCOUNT)) {
+        const accounts = $2c87226370e1ba97$export$e56de24c31a1cc9e(network);
+        if (accounts.hasOwnProperty(sender)) account = sender;
+        else return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`${sender} is not an account instantiated in the current environment. Check .taq/config.json`);
+    } else account = (0, $iVZbm$taquerianodesdk.TAQ_OPERATOR_ACCOUNT);
     const tezos = new (0, $iVZbm$taquitotaquito.TezosToolkit)(network.rpcUrl);
-    const key = await (0, $iVZbm$taquerianodesdk.getAccountPrivateKey)(parsedArgs, network, "taqRootAccount");
+    const key = await (0, $iVZbm$taquerianodesdk.getAccountPrivateKey)(parsedArgs, network, account);
     await (0, $iVZbm$taquitosigner.importKey)(tezos, key);
     return tezos;
 };
-const $944e64d99e99b46e$var$configureTezosToolKit = (parsedArgs, env)=>{
-    const targetConstraintErrMsg = "Each environment can only have one target, be it a sandbox or a network";
-    if (env.sandboxes?.length === 1 && env.networks?.length === 1) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(targetConstraintErrMsg);
-    if (env.sandboxes?.length === 1) return $944e64d99e99b46e$var$configureToolKitWithSandbox(parsedArgs, env.sandboxes[0]);
-    if (env.networks?.length === 1) return $944e64d99e99b46e$var$configureToolKitWithNetwork(parsedArgs, env.networks[0]);
-    return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(targetConstraintErrMsg);
+const $2c87226370e1ba97$export$ac04c99a21479c39 = (parsedArgs)=>Object.entries(parsedArgs.config.accounts).reduce((acc, declaredAccount)=>{
+        const alias = declaredAccount[0];
+        const mutez = declaredAccount[1];
+        return {
+            ...acc,
+            [alias]: typeof mutez === "string" ? parseFloat(mutez) : mutez
+        };
+    }, {});
+const $2c87226370e1ba97$export$f9fd6b8c665ab918 = (sandbox)=>sandbox?.accounts ? Object.entries(sandbox.accounts).reduce((acc, instantiatedAccount)=>{
+        const alias = instantiatedAccount[0];
+        const keys = instantiatedAccount[1];
+        return alias !== "default" ? {
+            ...acc,
+            [alias]: keys
+        } : acc;
+    }, {}) : {};
+const $2c87226370e1ba97$export$e56de24c31a1cc9e = (network)=>network.accounts ? Object.entries(network.accounts).reduce((acc, instantiatedAccount)=>{
+        const alias = instantiatedAccount[0];
+        const keys = instantiatedAccount[1];
+        return alias !== (0, $iVZbm$taquerianodesdk.TAQ_OPERATOR_ACCOUNT) ? {
+            ...acc,
+            [alias]: keys
+        } : acc;
+    }, {}) : {};
+const $2c87226370e1ba97$export$c5dc6d68f9166ad7 = async (parsedArgs, network, account)=>{
+    const tezos = new (0, $iVZbm$taquitotaquito.TezosToolkit)(network.rpcUrl);
+    const key = await (0, $iVZbm$taquerianodesdk.getAccountPrivateKey)(parsedArgs, network, account);
+    await (0, $iVZbm$taquitosigner.importKey)(tezos, key);
+};
+const $2c87226370e1ba97$export$eadeae1f47371140 = (err, env)=>{
+    if (err instanceof Error) {
+        const msg = err.message;
+        if (/ENOTFOUND/.test(msg)) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("The RPC URL may be invalid. Check ./.taq/config.json");
+        if (/ECONNREFUSED/.test(msg)) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("The RPC URL may be down or the sandbox is not running");
+        if (/empty_implicit_contract/.test(msg)) {
+            const result = msg.match(/(?<="implicit":")tz[^"]+(?=")/);
+            const publicKeyHash = result ? result[0] : undefined;
+            if (publicKeyHash) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`The account ${publicKeyHash} for the target environment, "${env}", may not be funded\nTo fund this account:\n1. Go to https://teztnets.xyz and click "Faucet" of the target testnet\n2. Copy and paste the above key into the wallet address field\n3. Request some Tez (Note that you might need to wait for a few seconds for the network to register the funds)`);
+        }
+    }
+    return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`Error while performing operation:\n${err} ${JSON.stringify(err, null, 2)}`);
 };
+
+
+
+
+
 const $944e64d99e99b46e$var$isContractAddress = (contract)=>contract.startsWith("tz1") || contract.startsWith("tz2") || contract.startsWith("tz3") || contract.startsWith("KT1");
-const $944e64d99e99b46e$var$getContractInfo = async (parsedArgs, env, tezos)=>{
+const $944e64d99e99b46e$var$getContractInfo = async (parsedArgs, env)=>{
     const contract = parsedArgs.contract;
     return {
         contractAlias: $944e64d99e99b46e$var$isContractAddress(contract) ? "N/A" : contract,
         contractAddress: $944e64d99e99b46e$var$isContractAddress(contract) ? contract : await (0, $iVZbm$taquerianodesdk.getAddressOfAlias)(env, contract),
-        tezTransfer: parsedArgs.tez ?? "0",
         parameter: parsedArgs.param ? await (0, $iVZbm$taquerianodesdk.getParameter)(parsedArgs, parsedArgs.param) : "Unit",
         entrypoint: parsedArgs.entrypoint ?? "default",
+        mutezTransfer: parseInt(parsedArgs.mutez ?? "0")
+    };
+};
+const $944e64d99e99b46e$var$createBatchForTransfer = (tezos, contractsInfo)=>contractsInfo.reduce((acc, contractInfo)=>acc.withTransfer({
+            to: contractInfo.contractAddress,
+            amount: contractInfo.mutezTransfer,
+            parameter: {
+                entrypoint: contractInfo.entrypoint,
+                value: new (0, $iVZbm$taquitomichelcodec.Parser)().parseMichelineExpression(contractInfo.parameter)
+            },
+            mutez: true
+        }), tezos.wallet.batch());
+const $944e64d99e99b46e$export$e61a38557a73155d = async (tezos, env, contractsInfo)=>{
+    const batch = $944e64d99e99b46e$var$createBatchForTransfer(tezos, contractsInfo);
+    try {
+        const op = await batch.send();
+        await op.confirmation();
+        return op;
+    } catch (err) {
+        return (0, $2c87226370e1ba97$export$eadeae1f47371140)(err, env);
+    }
+};
+const $944e64d99e99b46e$var$prepContractInfoForDisplay = (tezos, contractInfo)=>{
+    return {
+        contractAlias: contractInfo.contractAlias,
+        contractAddress: contractInfo.contractAddress,
+        parameter: contractInfo.parameter,
+        entrypoint: contractInfo.entrypoint,
+        mutezTransfer: contractInfo.mutezTransfer.toString(),
         destination: tezos.rpc.getRpcUrl()
     };
 };
-const $944e64d99e99b46e$var$performTransferOp = (tezos, contractInfo, parsedArgs)=>{
-    return tezos.contract.transfer({
-        to: contractInfo.contractAddress,
-        amount: parseFloat(contractInfo.tezTransfer),
-        parameter: {
-            entrypoint: contractInfo.entrypoint,
-            value: new (0, $iVZbm$taquitomichelcodec.Parser)().parseMichelineExpression(contractInfo.parameter)
-        }
-    }).then((op)=>op.confirmation().then(()=>op.hash)).catch((err)=>{
-        if (err instanceof Error) {
-            if (/empty_implicit_contract/.test(err.message)) {
-                const result = err.message.match(/(?<="implicit":")tz[^"]+(?=")/);
-                const publicKeyHash = result ? result[0] : undefined;
-                if (publicKeyHash) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`The account ${publicKeyHash} for the target environment, "${(0, $iVZbm$taquerianodesdk.getCurrentEnvironment)(parsedArgs)}", may not be funded\nTo fund this account:\n1. Go to https://teztnets.xyz and click "Faucet" of the target testnet\n2. Copy and paste the above key into the 'wallet address field\n3. Request some Tez (Note that you might need to wait for a few seconds for the network to register the funds)`);
-            }
-        }
-        return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`Error during transfer operation:\n${err} ${JSON.stringify(err, null, 2)}`);
+const $944e64d99e99b46e$var$transfer = async (parsedArgs)=>{
+    const env = (0, $iVZbm$taquerianodesdk.getCurrentEnvironmentConfig)(parsedArgs);
+    if (!env) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`There is no environment called ${parsedArgs.env} in your config.json`);
+    try {
+        const [envType, nodeConfig] = await (0, $2c87226370e1ba97$export$e1210318d02974b)(parsedArgs, env);
+        const tezos = await (envType === "Network" ? (0, $2c87226370e1ba97$export$5a1c5b7c3009d1b0)(parsedArgs, nodeConfig, parsedArgs.sender) : (0, $2c87226370e1ba97$export$cf995f4bdbe82fd9)(nodeConfig, parsedArgs.sender));
+        const contractInfo = await $944e64d99e99b46e$var$getContractInfo(parsedArgs, env);
+        await $944e64d99e99b46e$export$e61a38557a73155d(tezos, (0, $iVZbm$taquerianodesdk.getCurrentEnvironment)(parsedArgs), [
+            contractInfo
+        ]);
+        const contractInfoForDisplay = $944e64d99e99b46e$var$prepContractInfoForDisplay(tezos, contractInfo);
+        return (0, $iVZbm$taquerianodesdk.sendJsonRes)([
+            contractInfoForDisplay
+        ]);
+    } catch  {
+        return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("No operations performed");
+    }
+};
+var $944e64d99e99b46e$export$2e2bcd8739ae039 = $944e64d99e99b46e$var$transfer;
+
+
+const $1e142599cb4e04fd$var$getAccountsInfo = (parsedArgs, tezos, instantiatedAccounts)=>Promise.all(Object.entries(instantiatedAccounts).map(async (instantiatedAccount)=>{
+        const alias = instantiatedAccount[0];
+        const aliasInfo = instantiatedAccount[1];
+        const declaredMutez = (0, $2c87226370e1ba97$export$ac04c99a21479c39)(parsedArgs)[alias];
+        const currentBalanceInMutez = (await tezos.tz.getBalance(aliasInfo.publicKeyHash)).toNumber();
+        const amountToFillInMutez = declaredMutez ? Math.max(declaredMutez - currentBalanceInMutez, 0) : 0;
+        if (!declaredMutez) (0, $iVZbm$taquerianodesdk.sendWarn)(`Warning: ${alias} is instantiated in the target environment but not declared in the root level "accounts" field of ./.taq/config.json so ${alias} will not be funded as you don't have a declared tez amount set there for ${alias}\n`);
+        return {
+            contractAlias: alias,
+            contractAddress: aliasInfo.publicKeyHash,
+            parameter: "Unit",
+            entrypoint: "default",
+            mutezTransfer: parseInt(amountToFillInMutez.toString())
+        };
+    })).then((accountsInfo)=>accountsInfo.filter((accountInfo)=>accountInfo.mutezTransfer !== 0)).catch((err)=>(0, $iVZbm$taquerianodesdk.sendAsyncErr)(`Something went wrong while extracting account information - ${err}`));
+const $1e142599cb4e04fd$var$prepAccountsInfoForDisplay = (accountsInfo)=>accountsInfo.map((accountInfo)=>{
+        return {
+            accountAlias: accountInfo.contractAlias,
+            accountAddress: accountInfo.contractAddress,
+            mutezFunded: accountInfo.mutezTransfer.toString()
+        };
     });
+const $1e142599cb4e04fd$var$fund = async (parsedArgs)=>{
+    const env = (0, $iVZbm$taquerianodesdk.getCurrentEnvironmentConfig)(parsedArgs);
+    if (!env) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`There is no environment called ${parsedArgs.env} in your config.json`);
+    try {
+        const [envType, nodeConfig] = await (0, $2c87226370e1ba97$export$e1210318d02974b)(parsedArgs, env);
+        if (envType !== "Network") return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("taq fund can only be executed in a network environment");
+        const tezos = await (0, $2c87226370e1ba97$export$5a1c5b7c3009d1b0)(parsedArgs, nodeConfig);
+        const instantiatedAccounts = (0, $2c87226370e1ba97$export$e56de24c31a1cc9e)(nodeConfig);
+        const accountsInfo = await $1e142599cb4e04fd$var$getAccountsInfo(parsedArgs, tezos, instantiatedAccounts);
+        if (accountsInfo.length === 0) return (0, $iVZbm$taquerianodesdk.sendJsonRes)(`All instantiated accounts in the current environment, "${parsedArgs.env}", are funded up to or beyond the declared amount`);
+        await (0, $944e64d99e99b46e$export$e61a38557a73155d)(tezos, (0, $iVZbm$taquerianodesdk.getCurrentEnvironment)(parsedArgs), accountsInfo);
+        const accountsInfoForDisplay = $1e142599cb4e04fd$var$prepAccountsInfoForDisplay(accountsInfo);
+        return (0, $iVZbm$taquerianodesdk.sendJsonRes)(accountsInfoForDisplay);
+    } catch  {
+        return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("No operations performed");
+    }
 };
-const $944e64d99e99b46e$export$c9b234447cf4ef7c = async (parsedArgs)=>{
+var $1e142599cb4e04fd$export$2e2bcd8739ae039 = $1e142599cb4e04fd$var$fund;
+
+
+
+
+const $ae16ebef21e504f4$var$instantiate_account = async (parsedArgs)=>{
     const env = (0, $iVZbm$taquerianodesdk.getCurrentEnvironmentConfig)(parsedArgs);
-    if (!env) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`There is no environment called ${parsedArgs.env} in your config.json.`);
+    if (!env) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`There is no environment called ${parsedArgs.env} in your config.json`);
     try {
-        const tezos = await $944e64d99e99b46e$var$configureTezosToolKit(parsedArgs, env);
-        const contractInfo = await $944e64d99e99b46e$var$getContractInfo(parsedArgs, env, tezos);
-        await $944e64d99e99b46e$var$performTransferOp(tezos, contractInfo, parsedArgs);
-        return (0, $iVZbm$taquerianodesdk.sendJsonRes)([
+        const [envType, nodeConfig] = await (0, $2c87226370e1ba97$export$e1210318d02974b)(parsedArgs, env);
+        if (envType !== "Network") return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("taq instantiate-account can only be executed in a network environment");
+        const declaredAccountAliases = Object.keys((0, $2c87226370e1ba97$export$ac04c99a21479c39)(parsedArgs));
+        const instantiatedAccounts = (0, $2c87226370e1ba97$export$e56de24c31a1cc9e)(nodeConfig);
+        let accountsInstantiated = [];
+        for (const declaredAccountAlias of declaredAccountAliases)if (!instantiatedAccounts.hasOwnProperty(declaredAccountAlias)) {
+            await (0, $2c87226370e1ba97$export$c5dc6d68f9166ad7)(parsedArgs, nodeConfig, declaredAccountAlias);
+            accountsInstantiated.push(declaredAccountAlias);
+        } else (0, $iVZbm$taquerianodesdk.sendWarn)(`Note: ${declaredAccountAlias} is already instantiated in the current environment, "${parsedArgs.env}"`);
+        if (accountsInstantiated.length !== 0) return (0, $iVZbm$taquerianodesdk.sendJsonRes)(`Accounts instantiated: ${accountsInstantiated.join(", ")}.\nPlease execute "taq fund" targeting the same environment to fund these accounts`);
+        else return (0, $iVZbm$taquerianodesdk.sendJsonRes)(`No accounts were instantiated because they were all instantiated in the target environment already`);
+    } catch  {
+        return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("No operations performed");
+    }
+};
+var $ae16ebef21e504f4$export$2e2bcd8739ae039 = $ae16ebef21e504f4$var$instantiate_account;
+
+
+
+
+
+
+const $806c5c6032403442$var$getContractPath = (parsedArgs, contractFilename)=>(0, $iVZbm$path.join)(parsedArgs.config.artifactsDir, /\.tz$/.test(contractFilename) ? contractFilename : `${contractFilename}.tz`);
+const $806c5c6032403442$var$getDefaultStorageFilename = (contractName)=>{
+    const baseFilename = (0, $iVZbm$path.basename)(contractName, (0, $iVZbm$path.extname)(contractName));
+    const extFilename = (0, $iVZbm$path.extname)(contractName);
+    const defaultStorage = `${baseFilename}.default_storage${extFilename}`;
+    return defaultStorage;
+};
+const $806c5c6032403442$var$getContractInfo = async (parsedArgs)=>{
+    const contract = parsedArgs.contract;
+    const contractPath = $806c5c6032403442$var$getContractPath(parsedArgs, contract);
+    const contractCode = await (0, $iVZbm$fspromises.readFile)(contractPath, "utf-8");
+    const storageFilename = parsedArgs.storage ?? $806c5c6032403442$var$getDefaultStorageFilename(contract);
+    const contractInitStorage = await (0, $iVZbm$taquerianodesdk.getInitialStorage)(parsedArgs, storageFilename);
+    if (contractInitStorage === undefined) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`❌ No initial storage file was found for ${contract}\nStorage must be specified in a file as a Michelson expression and will automatically be linked to this contract if specified with the name "${$806c5c6032403442$var$getDefaultStorageFilename(contract)}" in the artifacts directory\nYou can also manually pass a storage file to the originate task using the --storage STORAGE_FILE_NAME option\n`);
+    return {
+        contract: contract,
+        code: contractCode,
+        initStorage: contractInitStorage,
+        mutezTransfer: parseInt(parsedArgs.mutez ?? "0")
+    };
+};
+const $806c5c6032403442$var$createBatchForOriginate = (tezos, contractsInfo)=>contractsInfo.reduce((acc, contractInfo)=>acc.withOrigination({
+            code: contractInfo.code,
+            init: contractInfo.initStorage,
+            balance: contractInfo.mutezTransfer.toString(),
+            mutez: true
+        }), tezos.wallet.batch());
+const $806c5c6032403442$export$4737da0e626ec8c7 = async (tezos, env, contractsInfo)=>{
+    const batch = $806c5c6032403442$var$createBatchForOriginate(tezos, contractsInfo);
+    try {
+        const op = await batch.send();
+        await op.confirmation();
+        return op;
+    } catch (err) {
+        return (0, $2c87226370e1ba97$export$eadeae1f47371140)(err, env);
+    }
+};
+const $806c5c6032403442$var$prepContractInfoForDisplay = async (parsedArgs, tezos, contractInfo, op)=>{
+    const operationResults = await op.operationResults();
+    const originationResults = operationResults.filter((result)=>result.kind === "origination").map((result)=>result);
+    // Length should be 1 since we are batching originate operations into one
+    const result1 = originationResults.length === 1 ? originationResults[0] : undefined;
+    const address = result1?.metadata?.operation_result?.originated_contracts?.join(",");
+    const alias = parsedArgs.alias ?? (0, $iVZbm$path.basename)(contractInfo.contract, (0, $iVZbm$path.extname)(contractInfo.contract));
+    if (address) await (0, $iVZbm$taquerianodesdk.updateAddressAlias)(parsedArgs, alias, address);
+    return {
+        contract: contractInfo.contract,
+        address: address ?? "Something went wrong during origination",
+        alias: address ? alias : "N/A",
+        balanceInMutez: contractInfo.mutezTransfer.toString(),
+        destination: tezos.rpc.getRpcUrl()
+    };
+};
+const $806c5c6032403442$var$originate = async (parsedArgs)=>{
+    const env = (0, $iVZbm$taquerianodesdk.getCurrentEnvironmentConfig)(parsedArgs);
+    if (!env) return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`There is no environment called ${parsedArgs.env} in your config.json`);
+    try {
+        const [envType, nodeConfig] = await (0, $2c87226370e1ba97$export$e1210318d02974b)(parsedArgs, env);
+        const tezos = await (envType === "Network" ? (0, $2c87226370e1ba97$export$5a1c5b7c3009d1b0)(parsedArgs, nodeConfig, parsedArgs.sender) : (0, $2c87226370e1ba97$export$cf995f4bdbe82fd9)(nodeConfig, parsedArgs.sender));
+        const contractInfo = await $806c5c6032403442$var$getContractInfo(parsedArgs);
+        const op = await $806c5c6032403442$export$4737da0e626ec8c7(tezos, (0, $iVZbm$taquerianodesdk.getCurrentEnvironment)(parsedArgs), [
             contractInfo
         ]);
+        const contractInfoForDisplay = await $806c5c6032403442$var$prepContractInfoForDisplay(parsedArgs, tezos, contractInfo, op);
+        return (0, $iVZbm$taquerianodesdk.sendJsonRes)([
+            contractInfoForDisplay
+        ]);
     } catch  {
-        return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("No operations performed.");
+        return (0, $iVZbm$taquerianodesdk.sendAsyncErr)("No operations performed");
     }
 };
-var $944e64d99e99b46e$export$2e2bcd8739ae039 = $944e64d99e99b46e$export$c9b234447cf4ef7c;
+var $806c5c6032403442$export$2e2bcd8739ae039 = $806c5c6032403442$var$originate;
+
 
 
 const $e6ed693f861ac256$export$71d25adf06a71b9 = (parsedArgs)=>{
     switch(parsedArgs.task){
-        case "originate":
         case "deploy":
             return (0, $806c5c6032403442$export$2e2bcd8739ae039)(parsedArgs);
         case "transfer":
-        case "call":
             return (0, $944e64d99e99b46e$export$2e2bcd8739ae039)(parsedArgs);
+        case "instantiate-account":
+            return (0, $ae16ebef21e504f4$export$2e2bcd8739ae039)(parsedArgs);
+        case "fund":
+            return (0, $1e142599cb4e04fd$export$2e2bcd8739ae039)(parsedArgs);
         default:
             return (0, $iVZbm$taquerianodesdk.sendAsyncErr)(`${parsedArgs.task} is not an understood task by the Taquito plugin`);
     }
@@ -326,6 +352,16 @@ var $e6ed693f861ac256$export$2e2bcd8739ae039 = $e6ed693f861ac256$export$71d25adf
                         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
+                    }),
+                    (0, $iVZbm$taquerianodesdk.Option).create({
+                        flag: "sender",
+                        description: "Name of an instantiated account to use as the sender of the originate operation",
+                        required: false
+                    }),
+                    (0, $iVZbm$taquerianodesdk.Option).create({
+                        flag: "mutez",
+                        description: "Amount of Mutez to transfer",
+                        required: false
                     }), 
                 ],
                 aliases: [
@@ -340,8 +376,8 @@ var $e6ed693f861ac256$export$2e2bcd8739ae039 = $e6ed693f861ac256$export$71d25adf
                 description: "Transfer/call an implicit account or a smart contract (specified via its alias or address) deployed to a particular environment",
                 options: [
                     (0, $iVZbm$taquerianodesdk.Option).create({
-                        flag: "tez",
-                        description: "Amount of Tez to transfer",
+                        flag: "mutez",
+                        description: "Amount of Mutez to transfer",
                         required: false
                     }),
                     (0, $iVZbm$taquerianodesdk.Option).create({
@@ -353,6 +389,11 @@ var $e6ed693f861ac256$export$2e2bcd8739ae039 = $e6ed693f861ac256$export$71d25adf
                         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
+                    }),
+                    (0, $iVZbm$taquerianodesdk.Option).create({
+                        flag: "sender",
+                        description: "Name of an instantiated account to use as the sender of the transfer operation",
+                        required: false
                     }), 
                 ],
                 aliases: [
@@ -360,6 +401,20 @@ var $e6ed693f861ac256$export$2e2bcd8739ae039 = $e6ed693f861ac256$export$71d25adf
                 ],
                 handler: "proxy",
                 encoding: "application/json"
+            }),
+            (0, $iVZbm$taquerianodesdk.Task).create({
+                task: "fund",
+                command: "fund",
+                description: "Fund all the instantiated accounts up to the desired/declared amount in a target environment",
+                handler: "proxy",
+                encoding: "application/json"
+            }),
+            (0, $iVZbm$taquerianodesdk.Task).create({
+                task: "instantiate-account",
+                command: "instantiate-account",
+                description: 'Instantiate all accounts declared in the "accounts" field at the root level of the config file to a target environment',
+                handler: "proxy",
+                encoding: "application/json"
             }), 
         ],
         proxy: (0, $e6ed693f861ac256$export$2e2bcd8739ae039)