Merge pull request #1186 from ainblockchain/bugfix/platfowner/bugfix

Fix invalid receipts error with rest function call

common/common-util.js

@@ -551,7 +551,7 @@ class CommonUtil {
  // TODO(platfowner): Consider some code (e.g. IN_LOCKUP_PERIOD, INSUFFICIENT_BALANCE) no failure
  // so that their transactions are not reverted.
  static isFailedFuncResultCode(code) {
- return code !== FunctionResultCode.SUCCESS;
+ return code !== FunctionResultCode.SUCCESS && code !== FunctionResultCode.SKIP;
  }
 
  static isAppPath(parsedPath) {

common/result-code.js

@@ -126,6 +126,7 @@ const FailedTxPrecheckCodeSet = new Set([
 // If they are altered and deployed, the full sync of the blockchain nodes can fail.
 const FunctionResultCode = {
  SUCCESS: 0,
+ SKIP: 20000, // Normal skip
  FAILURE: 20001, // Normal failure
  INTERNAL_ERROR: 20002, // Something went wrong but don't know why
  // Transfer

db/functions.js

@@ -237,9 +237,7 @@ class Functions {
  }
  } else if (functionEntry.function_type === FunctionTypes.REST) {
  // NOTE: Skipped when the event source is null.
- if (NodeConfigs.ENABLE_REST_FUNCTION_CALL &&
- eventSource !== null &&
- functionEntry.function_url) {
+ if (functionEntry.function_url) {
  const restFunctionUrlWhitelist = this.db.getRestFunctionsUrlWhitelist();
  if (!CommonUtil.isWhitelistedUrl(functionEntry.function_url, restFunctionUrlWhitelist)) {
  // NOTE: Skipped when the function url is not in the whitelist.
@@ -255,43 +253,51 @@ class Functions {
  `function_url '${functionEntry.function_url}' with:\n` +
  formattedParams);
  }
- const newAuth = Object.assign(
- {}, auth, { fid: functionEntry.function_id, fids: this.getFids() });
- promises.push(axios.post(functionEntry.function_url, {
- fid: functionEntry.function_id,
- function: functionEntry,
- valuePath,
- functionPath,
- value,
- prevValue,
- params,
- timestamp,
- executedAt,
- transaction,
- blockNumber,
- blockTime,
- options,
- eventSource,
- auth: newAuth,
- chainId: blockchainParams.chainId,
- networkId: blockchainParams.networkId,
- }, {
- timeout: NodeConfigs.REST_FUNCTION_CALL_TIMEOUT_MS
- }).catch((error) => {
- if (DevFlags.enableRichFunctionLogging) {
- logger.error(
- `Failed to trigger REST function [[ ${functionEntry.function_id} ]] of ` +
- `function_url '${functionEntry.function_url}' with error: \n` +
- `${JSON.stringify(error)}` +
- formattedParams);
- }
- failCount++;
- return true;
- }));
- funcResults[functionEntry.function_id] = {
- code: FunctionResultCode.SUCCESS,
- bandwidth_gas_amount: blockchainParams.restFunctionCallGasAmount,
- };
+ if (NodeConfigs.ENABLE_REST_FUNCTION_CALL && eventSource !== null) {
+ const newAuth = Object.assign(
+ {}, auth, { fid: functionEntry.function_id, fids: this.getFids() });
+ promises.push(axios.post(functionEntry.function_url, {
+ fid: functionEntry.function_id,
+ function: functionEntry,
+ valuePath,
+ functionPath,
+ value,
+ prevValue,
+ params,
+ timestamp,
+ executedAt,
+ transaction,
+ blockNumber,
+ blockTime,
+ options,
+ eventSource,
+ auth: newAuth,
+ chainId: blockchainParams.chainId,
+ networkId: blockchainParams.networkId,
+ }, {
+ timeout: NodeConfigs.REST_FUNCTION_CALL_TIMEOUT_MS
+ }).catch((error) => {
+ if (DevFlags.enableRichFunctionLogging) {
+ logger.error(
+ `Failed to trigger REST function [[ ${functionEntry.function_id} ]] of ` +
+ `function_url '${functionEntry.function_url}' with error: \n` +
+ `${JSON.stringify(error)}` +
+ formattedParams);
+ }
+ failCount++;
+ return true;
+ }));
+ funcResults[functionEntry.function_id] = {
+ code: FunctionResultCode.SUCCESS,
+ bandwidth_gas_amount: blockchainParams.restFunctionCallGasAmount,
+ };
+ } else {
+ // Rest function trigger is skipped.
+ funcResults[functionEntry.function_id] = {
+ code: FunctionResultCode.SKIP,
+ bandwidth_gas_amount: blockchainParams.restFunctionCallGasAmount,
+ };
+ }
  triggerCount++;
  }
  }

start_local_blockchain.sh

@@ -12,7 +12,7 @@ printf "\n[[[[[ start_local_blockchain.sh ]]]]]\n\n"
 printf "\nStarting tracker..\n"
 PORT=8080 \
  P2P_PORT=5000 \
- CONSOLE_LOG=true \
+ CONSOLE_LOG=false \
  node ./tracker-server/index.js &
 printf "\nDone\n\n"
 sleep 5

start_local_blockchain_afan_shard.sh

@@ -10,7 +10,7 @@ printf "\n[[[[[ start_local_blockchain_afan_shard.sh ]]]]]\n\n"
 printf "\nStarting parent tracker..\n"
 PORT=8080 \
  P2P_PORT=5000 \
- CONSOLE_LOG=true \
+ CONSOLE_LOG=false \
  node ./tracker-server/index.js &
 printf "\nDone\n\n"
 sleep 5
@@ -60,7 +60,7 @@ printf "\nStarting afan child chain tracker..\n"
 BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/afan-shard \
  PORT=9000 \
  P2P_PORT=6000 \
- CONSOLE_LOG=true \
+ CONSOLE_LOG=false \
  node ./tracker-server/index.js &
 printf "\nDone\n\n"
 sleep 5

start_local_blockchain_multi_shards.sh

@@ -11,7 +11,7 @@ printf "\n[[[[[ start_local_blockchain_multi_shards.sh ]]]]]\n\n"
 printf "\nStarting parent tracker..\n"
 PORT=8080 \
  P2P_PORT=5000 \
- CONSOLE_LOG=true \
+ CONSOLE_LOG=false \
  node ./tracker-server/index.js &
 printf "\nDone\n\n"
 sleep 5
@@ -64,6 +64,7 @@ printf "\nStarting child chain 1 tracker..\n"
 BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/afan-shard \
  PORT=9000 \
  P2P_PORT=6000 \
+ CONSOLE_LOG=false \
  node ./tracker-server/index.js &
 printf "\nDone\n\n"
 sleep 10
@@ -131,6 +132,7 @@ printf "\nStarting child chain 2 tracker..\n"
 BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/sim-shard \
  PORT=9010 \
  P2P_PORT=6010 \
+ CONSOLE_LOG=false \
  node ./tracker-server/index.js &
 printf "\nDone\n\n"
 sleep 10

test/unit/functions.test.js

@@ -2723,7 +2723,7 @@ describe("Functions", () => {
  return triggerRes.func_promises.then((resp) => {
  assert.deepEqual(resp, {
  func_count: 1,
- trigger_count: 0,
+ trigger_count: 1,
  fail_count: 0,
  });
  });