Skip to content

Allow including imports in rest_5.js #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
th0114nd wants to merge 1 commit into from
Closed

Allow including imports in rest_5.js #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions lib/rest_5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,14 @@ function* callList(user, txs, doNotResolve, node) {
* @param{Boolean} doNotResolve tell bloc to wait for resolution or return immediately
* @param{Object} txParams {gasLimit: Number, gasPrice: Number}
* @param{Number} node target nodeId
* @param{Object} imports Names and sources of files imported in contractSrc, e.g. {"imp.sol": "contract Imp {}", ...}
* @returns{()} doNotResolve=true: [transaction hash] (String), doNotResolve=false: [uploaded contract details]
*/
function* uploadContractString(user, contractName, contractSrc, args, doNotResolve, txParams, node) {
function* uploadContractString(user, contractName, contractSrc, args, doNotResolve, txParams, node, imports) {
const resolve = (doNotResolve) ? false : true;
args = args || {};
txParams = txParams || {};
imports = imports || {};
verbose('uploadContractString', {user, contractName, args, txParams, resolve, node});

var result = yield api.bloc.contract({
Expand All @@ -254,6 +256,7 @@ function* uploadContractString(user, contractName, contractSrc, args, doNotResol
args: args,
contract: contractName,
txParams: txParams,
imports: imports,
}, user.name, user.address, resolve, node)
.catch(function(e) {
throw (e instanceof Error) ? e : new HttpError(e);
Expand All @@ -278,12 +281,17 @@ function* uploadContractString(user, contractName, contractSrc, args, doNotResol
return result.hash;
}

function* uploadContract(user, contractName, contractFilename, args, doNotResolve, txParams, node) {
function* uploadContract(user, contractName, contractFilename, args, doNotResolve, txParams, node, importFilenames) {
verbose('uploadContract', {user, contractName, contractFilename, args, doNotResolve, txParams, node});
// get the source
// get the main source
const contractSrc = yield getContractString(contractName, contractFilename);
// get the import sources
const srcImports = {}
for (const file in importFilenames) {
srcImports[file] = yield getContractString("<imported>", file);
}
// upload
return yield uploadContractString(user, contractName, contractSrc, args, doNotResolve, txParams, node);
return yield uploadContractString(user, contractName, contractSrc, args, doNotResolve, txParams, node, srcImports);
}

/**
Expand Down