Skip to content

Commit

Permalink
- improved RPC error parsing
Browse files Browse the repository at this point in the history 
- updated tests
- version
  • Loading branch information
@anonymoussprocket
anonymoussprocket committed Aug 24, 2020
1 parent 96b329c commit c62b19d
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
@@ -1,7 +1,7 @@
{
"name": "conseiljs",
"version": "5.0.4",
"description": "Client-side library for dApp development.",
"version": "5.0.5",
"description": "Client-side library for Tezos dApp development.",
"browser": "dist/index-web.js",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
28 changes: 21 additions & 7 deletions src/chain/tezos/TezosNodeWriter.ts
View file
Expand Up @@ -708,7 +708,7 @@ export namespace TezosNodeWriter {
* @param {string} response Text response from a Tezos RPC services
* @returns Error text or `undefined`
*/
function parseRPCError(response: string) {
export function parseRPCError(response: string) {
let errors = '';

try {
Expand All @@ -717,15 +717,16 @@ export namespace TezosNodeWriter {

if ('kind' in arr[0]) {
// TODO: show counter errors better: e.msg "already used for contract"
errors = arr.map(e => `(${e.kind}: ${e.id})`).join('');
errors = arr.map(e => `(${e.kind}: ${e.id})`).join(', ');
} else if (arr.length === 1 && arr[0].contents.length === 1 && arr[0].contents[0].kind === 'activate_account') {
// in CARTHAGE and prior protocols activation failures are caught in the first branch
} else {
errors = arr.map(r => r.contents)
.map(o => o.map(c => c.metadata.operation_result)
.filter(r => r.status !== 'applied')
.map(r => `${r.status}: ${r.errors.map(e => `(${e.kind}: ${e.id})`).join(', ')}\n`))
.join('');
.map(o =>
o.map(c => c.metadata.operation_result)
.concat(o.flatMap(c => c.metadata.internal_operation_results).filter(c => !!c).map(c => c.result))
.map(r => parseRPCOperationResult(r)).join(', '))
.join(', ');
}
} catch (err) {
if (response.startsWith('Failed to parse the request body: ')) {
Expand All @@ -742,7 +743,20 @@ export namespace TezosNodeWriter {

if (errors.length > 0) {
log.debug(`errors found in response:\n${response}`);
throw new ServiceResponseError(200, '', '', '', response);
let e = new ServiceResponseError(200, '', '', '', response);
e.message = errors;
throw e;
}
}

/**
* Processes `operation_result` and `internal_operation_results` objects from the RPC responses into an error string.
*/
function parseRPCOperationResult(result: any): string {
if (result.status === 'failed') {
return `${result.status}: ${result.errors.map(e => `(${e.kind}: ${e.id})`).join(', ')}`;
} else { // backtracked, skipped
return result.status;
}
}
}
15 changes: 15 additions & 0 deletions test/chain/tezos/TezosNodeWriter.spec.ts
View file
Expand Up @@ -150,6 +150,21 @@ describe('TezosNodeWriter tests', () => {
expect(sendResult.operationGroupID).to.equal('"ooZ5Yc4bzUK76eXh4h5SBAMtMTBXhrHwVQe6McwfJsfrtXbnsPr"');
}));

it('parseRPCError test', () => {
const samples = [{
in: `[{"contents":[{"kind":"transaction","source":"tz1WMknckDL3NPWN1CCiBv2E9YyC7yiUFufU","fee":"100000","counter":"2005175","gas_limit":"605000","storage_limit":"10000","amount":"0","destination":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","parameters":{"entrypoint":"default","value":{"prim":"Left","args":[{"prim":"Left","args":[{"prim":"Pair","args":[{"int":"311"},{"int":"5"}]}]}]}},"metadata":{"balance_updates":[{"kind":"contract","contract":"tz1WMknckDL3NPWN1CCiBv2E9YyC7yiUFufU","change":"-100000"},{"kind":"freezer","category":"fees","delegate":"tz1Ke2h7sDdakHJQh8WX4Z372du1KChsksyU","cycle":323,"change":"100000"}],"operation_result":{"status":"backtracked","storage":{"prim":"Pair","args":[{"prim":"Pair","args":[{"prim":"Pair","args":[{"bytes":"0000270c03cf07a0b7d13d71ab280a515ac50b9c8aed"},{"int":"10035000"}]},{"prim":"Pair","args":[[{"prim":"Elt","args":[{"int":"5"},[{"prim":"Elt","args":[{"int":"311"},{"prim":"Pair","args":[{"int":"42849"},[{"bytes":"0000d199a62d3f8468fcc7ad7ab0252d598aecdd74a3"},{"bytes":"00000f0685dd791047c90cc924e12854e903e015ebdd"},{"bytes":"0000759573840c5d74223d8fe9b32fab50edfaf56489"},{"bytes":"0000ed68ed5fa89ffedff2f7271947fb26ea813f0fcc"},{"bytes":"00005c84f0255dc2929a7e6094ad8b1385cc703b334d"},{"bytes":"0000a64fca8426532428e99239e267b7f09f48bfefeb"},{"bytes":"00001de3fdd151392bab8583b89bca12d18cac2dd818"}]]}]},{"prim":"Elt","args":[{"int":"317"},{"prim":"Pair","args":[{"int":"85401"},[{"bytes":"00005c84f0255dc2929a7e6094ad8b1385cc703b334d"}]]}]}]]},{"prim":"Elt","args":[{"int":"10"},[]]},{"prim":"Elt","args":[{"int":"15"},[]]}],[{"prim":"Elt","args":[{"int":"5"},{"int":"5000000"}]},{"prim":"Elt","args":[{"int":"10"},{"int":"3000000"}]},{"prim":"Elt","args":[{"int":"15"},{"int":"1000000"}]}]]}]},{"prim":"Pair","args":[{"prim":"Pair","args":[{"int":"317"},{"int":"175000"}]},{"prim":"Pair","args":[{"int":"1"},[{"prim":"Elt","args":[{"int":"5"},{"int":"50"}]},{"prim":"Elt","args":[{"int":"10"},{"int":"75"}]},{"prim":"Elt","args":[{"int":"15"},{"int":"100"}]}]]}]}]},"consumed_gas":"186565","storage_size":"4614"},"internal_operation_results":[{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":0,"amount":"5000000","destination":"tz1ekHywVUsQJ9wznM6wQPpSv8233MYj8dXV","result":{"status":"backtracked","balance_updates":[{"kind":"contract","contract":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","change":"-5000000"},{"kind":"contract","contract":"tz1ekHywVUsQJ9wznM6wQPpSv8233MYj8dXV","change":"5000000"}],"consumed_gas":"10207"}},{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":1,"amount":"5157500","destination":"tz1M1UeDWKDHazBEjN2gHWxKKmgbEkjXaBAv","result":{"status":"backtracked","balance_updates":[{"kind":"contract","contract":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","change":"-5157500"},{"kind":"contract","contract":"tz1M1UeDWKDHazBEjN2gHWxKKmgbEkjXaBAv","change":"5157500"}],"consumed_gas":"10207"}},{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":2,"amount":"5000000","destination":"tz1WMknckDL3NPWN1CCiBv2E9YyC7yiUFufU","result":{"status":"failed","errors":[{"kind":"temporary","id":"proto.006-PsCARTHA.contract.balance_too_low","contract":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","balance":"4685001","amount":"5000000"}]}},{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":3,"amount":"5000000","destination":"tz1hHLY4AzGXrqzapnA3JYurGrPb5d3RnG7M","result":{"status":"skipped"}},{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":4,"amount":"5000000","destination":"tz1U5E7U225tYk5uuNDpQpcQ2e4hCmekBadh","result":{"status":"skipped"}},{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":5,"amount":"5000000","destination":"tz1aoQSwjDU4pxSwT5AsBiK5Xk15FWgBJoYr","result":{"status":"skipped"}},{"kind":"transaction","source":"KT1FVXpwQnoL4VVk9gxn26VTLz2Aa8zmvAdd","nonce":6,"amount":"5000000","destination":"tz1NN5QooJWkW44KFfrXqLRaxEa5Wxw3f9FF","result":{"status":"skipped"}}]}}],"signature":"edsigtjebZX3vY6D4gCBkdebosUAqpCC8BfcasVR5LmAmyLZnkWXiwoAKYKGDPgLaKDqorJsxLBrayTBKb572r88pv3zRE7taXz"}]`,
out: 'backtracked, backtracked, backtracked, failed: (temporary: proto.006-PsCARTHA.contract.balance_too_low), skipped, skipped, skipped, skipped'
}, {
in: `[{ "contents": [{ "kind": "transaction", "source": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW", "fee": "1006930", "counter": "437661", "gas_limit": "69292", "storage_limit": "0", "amount": "0", "destination": "KT1JFF5gnmVvFsYmyVB6Uqyu2LccHf8LZUkA", "parameters": { "entrypoint": "update", "value": [] }, "metadata": { "balance_updates": [{ "kind": "contract", "contract": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW", "change": "-1006930" }, { "kind": "freezer", "category": "fees", "delegate": "tz1Ke2h7sDdakHJQh8WX4Z372du1KChsksyU", "cycle": 291, "change": "1006930" }], "operation_result": { "status": "backtracked", "storage": { "prim": "Pair", "args": [{ "int": "11082" }, { "prim": "Some", "args": [{ "bytes": "01034170a2083dccbc2be253885a8d0e9f7ce859eb370d0c5cae3b6994af4cb9d666" }] }] }, "big_map_diff": [{ "action": "update", "big_map": "11082", "key_hash": "exprtqUntj1ohCsEQCP2ggwU5m5gWJD5aqGZVv8RshXA5zRhUrh3A1", "key": { "string": "BAT-USDC" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "expruDEDcy5nG4V1Up1HToC5wXZGtZXHCYNsYHBgZyUJKA44e2qnhV", "key": { "string": "BTC-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "exprtkNNzcMRGPYAVQbdXkp8UCJbrX1JgFgCBYcrrff5svE3xdu3KY", "key": { "string": "COMP-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "exprus7Hrujrc3xz8RVUfekxTqiDFcG8xRUQUYv3eunLkxruvNBMeD", "key": { "string": "DAI-USDC" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "exprv9NLX1skZHFM1i6eXc7eAazz25T1BVjkDzc47fWEEjn6y2Zsay", "key": { "string": "ETH-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "exprtfywZSkNmyonkwgKvcuiR6xV7X9ymvofbEHwBzMJKA7QxAQLXp", "key": { "string": "KNC-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "expruN2dG6bWSAUNefFCdJ244bEekeGkUMCNhcQGhzJXmAYpcbgnVG", "key": { "string": "LINK-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "expru4Xom8ojhm2xgG7LGHjW3mMemUFErPG81murPbfC4aA45gN9Dh", "key": { "string": "REP-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "exprukkbxD4rqiYFhFNSkLHfyEfbVEMirvDS9naHRjGKbzPsREJfmc", "key": { "string": "XTZ-USD" }, "value": {} }, { "action": "update", "big_map": "11082", "key_hash": "expruhMtUwed1qV2jRCfgdaoVLF4eHWcnE12jhYbqibWLCUeNjKBaH", "key": { "string": "ZRX-USD" }, "value": {} }], "consumed_gas": "69292", "storage_size": "2297" } } }, { "kind": "transaction", "source": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW", "fee": "1018036", "counter": "437662", "gas_limit": "180359", "storage_limit": "0", "amount": "0", "destination": "KT1JFF5gnmVvFsYmyVB6Uqyu2LccHf8LZUkA", "parameters": { "entrypoint": "push", "value": { "string": "KT1QskLhCJ4jzRReju3pGkYdtxojWpE8V7vF%update" } }, "metadata": { "balance_updates": [{ "kind": "contract", "contract": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW", "change": "-1018036" }, { "kind": "freezer", "category": "fees", "delegate": "tz1Ke2h7sDdakHJQh8WX4Z372du1KChsksyU", "cycle": 291, "change": "1018036" }], "operation_result": { "status": "backtracked", "storage": { "prim": "Pair", "args": [{ "int": "11082" }, { "prim": "Some", "args": [{ "bytes": "01034170a2083dccbc2be253885a8d0e9f7ce859eb370d0c5cae3b6994af4cb9d666" }] }] }, "big_map_diff": [{ "action": "copy", "source_big_map": "11082", "destination_big_map": "-1" }], "consumed_gas": "80359", "storage_size": "2297" }, "internal_operation_results": [{ "kind": "transaction", "source": "KT1JFF5gnmVvFsYmyVB6Uqyu2LccHf8LZUkA", "nonce": 0, "amount": "0", "destination": "KT1QskLhCJ4jzRReju3pGkYdtxojWpE8V7vF", "parameters": { "entrypoint": "update", "value": { "int": "-1" } }, "result": { "status": "failed", "errors": [{ "kind": "temporary", "id": "proto.006-PsCARTHA.michelson_v1.runtime_error", "contract_handle": "KT1QskLhCJ4jzRReju3pGkYdtxojWpE8V7vF", "contract_code": [] }, { "kind": "temporary", "id": "proto.006-PsCARTHA.gas_exhausted.operation" }] } }] } }], "signature": "edsigteY4kCSadjUNe4KWaZu8zs82YGCzyZS1SkUqmpacRtmBHN1Nf5Zjyw5m2o41a6gtwoeaEwocWKzHC9BZa9FTVC9GDjQPs1" }]`,
out: 'backtracked, backtracked, failed: (temporary: proto.006-PsCARTHA.michelson_v1.runtime_error), (temporary: proto.006-PsCARTHA.gas_exhausted.operation)'
}];

samples.map(s => {
expect(() => TezosNodeWriter.parseRPCError(s.in)).to.throw().with.property('message', s.out);
});

});

it('testContractInvocationOperation test', mochaAsync(async () => { }));

it('testContractDeployOperation test', mochaAsync(async () => { }));
Expand Down

0 comments on commit c62b19d

Please sign in to comment.