@api3/commons 0.8.0 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createLogger = exports.validateLogConfig = exports.wrapper = exports.createBaseLogger = exports.logLevelOptions = exports.logFormatOptions = void 0;
7
+ const isError_1 = __importDefault(require("lodash/isError"));
7
8
  const winston_1 = __importDefault(require("winston"));
8
9
  const winston_console_format_1 = require("winston-console-format");
9
10
  const async_storage_1 = require("./async-storage");
@@ -52,11 +53,18 @@ const createBaseLogger = (config) => {
52
53
  });
53
54
  };
54
55
  exports.createBaseLogger = createBaseLogger;
56
+ const parseLocalContext = (localContext) => {
57
+ // Sometimes an error passed as a context, but when JS error has no own enumerable properties, so when it is spread
58
+ // (using ...) we get an empty object and lose all the context.
59
+ if ((0, isError_1.default)(localContext))
60
+ return { error: localContext.message, name: localContext.name };
61
+ return localContext;
62
+ };
55
63
  const createFullContext = (localContext) => {
56
64
  const globalContext = (0, async_storage_1.getAsyncLocalStorage)().getStore();
57
65
  if (!globalContext && !localContext)
58
66
  return;
59
- const fullContext = { ...globalContext, ...localContext };
67
+ const fullContext = { ...globalContext, ...parseLocalContext(localContext) };
60
68
  // If the context contains a `name` or `message` field, it will override the `name` and `message` fields of the log
61
69
  // entry. To avoid this, we return the context as a separate field.
62
70
  return { ctx: fullContext };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"processing.js","sourceRoot":"","sources":["../../src/processing/processing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"processing.js","sourceRoot":"","sources":["../../src/processing/processing.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"unsafe-evaluate.js","sourceRoot":"","sources":["../../src/processing/unsafe-evaluate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unsafe-evaluate.js","sourceRoot":"","sources":["../../src/processing/unsafe-evaluate.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"vm-timers.js","sourceRoot":"","sources":["../../src/processing/vm-timers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACI,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,IAAI,QAAQ,GAAqB,EAAE,CAAC;IAEpC,MAAM,gBAAgB,GAAG,CAAC,EAAc,EAAE,EAAU,EAAE,EAAE;QACtD,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAE,EAAE;QAChD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC;QAC5D,YAAY,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,YAAY,CAAC,OAAO,CAAC,CAAC;SACvB;QACD,QAAQ,GAAG,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,IAAI,SAAS,GAAqB,EAAE,CAAC;IAErC,MAAM,iBAAiB,GAAG,CAAC,EAAc,EAAE,EAAU,EAAE,EAAE;QACvD,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,CAAC,EAAkB,EAAE,EAAE;QACjD,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;QAChE,aAAa,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;YAC/B,aAAa,CAAC,OAAO,CAAC,CAAC;SACxB;QACD,SAAS,GAAG,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,gBAAgB,EAAE,CAAC;QACnB,iBAAiB,EAAE,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,kBAAkB;QAClB,gBAAgB;QAChB,iBAAiB;QACjB,mBAAmB;QACnB,iBAAiB;QACjB,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAnDW,QAAA,YAAY,gBAmDvB"}
1
+ {"version":3,"file":"vm-timers.js","sourceRoot":"","sources":["../../src/processing/vm-timers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACI,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,IAAI,QAAQ,GAAqB,EAAE,CAAC;IAEpC,MAAM,gBAAgB,GAAG,CAAC,EAAc,EAAE,EAAU,EAAE,EAAE;QACtD,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,CAAC,EAAkB,EAAE,EAAE;QAChD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC;QAC5D,YAAY,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,YAAY,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QACD,QAAQ,GAAG,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,IAAI,SAAS,GAAqB,EAAE,CAAC;IAErC,MAAM,iBAAiB,GAAG,CAAC,EAAc,EAAE,EAAU,EAAE,EAAE;QACvD,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,CAAC,EAAkB,EAAE,EAAE;QACjD,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;QAChE,aAAa,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;YAChC,aAAa,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QACD,SAAS,GAAG,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,gBAAgB,EAAE,CAAC;QACnB,iBAAiB,EAAE,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,kBAAkB;QAClB,gBAAgB;QAChB,iBAAiB;QACjB,mBAAmB;QACnB,iBAAiB;QACjB,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAnDW,QAAA,YAAY,gBAmDvB"}
package/package.json CHANGED
@@ -1,11 +1,16 @@
1
1
  {
2
2
  "name": "@api3/commons",
3
- "version": "0.8.0",
3
+ "version": "0.9.1",
4
4
  "keywords": [],
5
5
  "license": "MIT",
6
6
  "engines": {
7
7
  "node": ">=18.14.0"
8
8
  },
9
+ "sideEffects": false,
10
+ "repository": {
11
+ "type": "git",
12
+ "url": "https://github.com/api3dao/commons"
13
+ },
9
14
  "files": [
10
15
  "dist",
11
16
  "src"
@@ -25,15 +30,15 @@
25
30
  "@typescript-eslint/parser": "^6.2.1",
26
31
  "axios": "^1.6.7",
27
32
  "dotenv": "^16.4.5",
28
- "eslint-config-next": "^13.1.6",
33
+ "eslint-config-next": "^14.2.3",
29
34
  "eslint-plugin-check-file": "^2.6.2",
30
- "eslint-plugin-cypress": "^2.14.0",
35
+ "eslint-plugin-cypress": "^3.2.0",
31
36
  "eslint-plugin-deprecation": "^2.0.0",
32
37
  "eslint-plugin-functional": "^6.0.0",
33
38
  "eslint-plugin-import": "^2.28.1",
34
39
  "eslint-plugin-jest": "^27.4.2",
35
40
  "eslint-plugin-jest-formatting": "^3.1.0",
36
- "eslint-plugin-lodash": "^7.4.0",
41
+ "eslint-plugin-lodash": "^8.0.0",
37
42
  "eslint-plugin-no-only-tests": "^3.1.0",
38
43
  "eslint-plugin-promise": "^6.1.1",
39
44
  "eslint-plugin-react": "^7.32.1",
@@ -46,26 +51,25 @@
46
51
  "zod": "^3.22.4"
47
52
  },
48
53
  "devDependencies": {
49
- "@types/jest": "^29.5.5",
50
- "@types/lodash": "^4.14.199",
51
- "@types/node": "^20.8.0",
52
- "eslint": "^8.50.0",
53
- "husky": "^8.0.3",
54
+ "@types/jest": "^29.5.12",
55
+ "@types/lodash": "^4.17.1",
56
+ "@types/node": "^20.12.11",
57
+ "eslint": "^8.57.0",
58
+ "husky": "^9.0.11",
54
59
  "jest": "^29.7.0",
55
- "nodemon": "^3.0.1",
56
- "prettier": "^3.0.3",
57
- "rimraf": "^5.0.5",
58
- "ts-jest": "^29.1.1",
59
- "ts-node": "^10.9.1",
60
- "typescript": "^5.2.2"
60
+ "nodemon": "^3.1.0",
61
+ "prettier": "^3.2.5",
62
+ "rimraf": "^5.0.7",
63
+ "ts-jest": "^29.1.2",
64
+ "ts-node": "^10.9.2",
65
+ "typescript": "^5.4.5"
61
66
  },
62
67
  "peerDependencies": {
63
- "eslint": "^8.50.0"
68
+ "eslint": "^8.57.0"
64
69
  },
65
70
  "scripts": {
66
71
  "build": "tsc --project tsconfig.build.json",
67
72
  "clean": "rm -rf coverage dist",
68
- "dev": "nodemon --ext ts,js,json,env --exec \"pnpm ts-node src/index.ts\"",
69
73
  "eslint:check": "eslint --report-unused-disable-directives --cache --ext js,ts,tsx,jsx . --max-warnings 0",
70
74
  "eslint:fix": "pnpm run eslint:check --fix",
71
75
  "prettier:check": "prettier --check \"./**/*.{js,ts,md,json}\"",
@@ -6,16 +6,18 @@ import {
6
6
  deriveBeaconSetId,
7
7
  deriveEndpointId,
8
8
  deriveSponsorWallet,
9
+ deriveSponsorWalletAddress,
9
10
  deriveTemplateIdV0,
10
11
  deriveTemplateIdV1,
11
12
  deriveWalletPathFromSponsorAddress,
12
13
  fromBytes32String,
13
14
  PROTOCOL_IDS,
14
15
  toBytes32String,
16
+ verifyAirnodeXpub,
15
17
  } from './derivation';
16
18
  import type { Address } from './schema';
17
19
 
18
- describe('deriveWalletPathFromSponsorAddress', () => {
20
+ describe(deriveWalletPathFromSponsorAddress.name, () => {
19
21
  it('converts address to derivation path', () => {
20
22
  const sponsorAddress = '0x8A45eac0267dD0803Fd957723EdE10693A076698';
21
23
  const res = deriveWalletPathFromSponsorAddress(sponsorAddress, PROTOCOL_IDS.AIRSEEKER);
@@ -52,109 +54,179 @@ describe('deriveWalletPathFromSponsorAddress', () => {
52
54
  expect.objectContaining({ name: expect.stringContaining('Error') })
53
55
  );
54
56
  });
57
+ });
58
+
59
+ describe(deriveSponsorWallet.name, () => {
60
+ it('derives a sponsor wallet', () => {
61
+ const dapiName = ethers.utils.formatBytes32String('BTC/ETH');
62
+ const sponsorWallet = deriveSponsorWallet(
63
+ 'test test test test test test test test test test test junk',
64
+ dapiName,
65
+ '1'
66
+ );
67
+
68
+ expect(sponsorWallet.address).toBe('0x4f86228e0Bc58829Cd77547224291bb8d212174D');
69
+ });
70
+
71
+ it('throws deriving a sponsor wallet due to an invalid DApi name', () => {
72
+ const dapiName = 'invalid dapi name';
73
+ const throwingFn = () =>
74
+ deriveSponsorWallet('test test test test test test test test test test test junk', dapiName, '5');
55
75
 
56
- describe('blockchain utilities', () => {
57
- it('derives a sponsor wallet', () => {
58
- const dapiName = ethers.utils.formatBytes32String('BTC/ETH');
59
- const sponsorWallet = deriveSponsorWallet(
60
- 'test test test test test test test test test test test junk',
61
- dapiName,
62
- '1'
76
+ expect(throwingFn).toThrow(expect.objectContaining({ name: expect.stringContaining('Error') }));
77
+ });
78
+
79
+ it('derives the same sponsor wallet as Airnode', () => {
80
+ function deriveSponsorWalletAirnode(masterHDNode: ethers.utils.HDNode, sponsorAddress: Address): ethers.Wallet {
81
+ const sponsorWalletHdNode = masterHDNode.derivePath(
82
+ `m/44'/60'/0'/${deriveWalletPathFromSponsorAddress(sponsorAddress, '1')}`
63
83
  );
84
+ return new ethers.Wallet(sponsorWalletHdNode.privateKey);
85
+ }
86
+ const mnemonic = 'achieve climb couple wait accident symbol spy blouse reduce foil echo label';
87
+ const hdNode = ethers.utils.HDNode.fromMnemonic(mnemonic);
64
88
 
65
- expect(sponsorWallet.address).toBe('0x4f86228e0Bc58829Cd77547224291bb8d212174D');
66
- });
89
+ // https://github.com/api3dao/airnode/blob/a4c17c28c8b31c9fb13d2828764b89f1063b702f/packages/airnode-node/src/evm/wallet.test.ts#L25
90
+ const expectedSponsorWallet = deriveSponsorWalletAirnode(hdNode, '0x06f509f73eefba36352bc8228f9112c3786100da');
91
+ const actualSponsorWallet = deriveSponsorWallet(mnemonic, '0x06f509f73eefba36352bc8228f9112c3786100da', '1');
67
92
 
68
- it('throws deriving a sponsor wallet due to an invalid DApi name', () => {
69
- const dapiName = 'invalid dapi name';
70
- const throwingFn = () =>
71
- deriveSponsorWallet('test test test test test test test test test test test junk', dapiName, '5');
93
+ expect(actualSponsorWallet.address).toBe(expectedSponsorWallet.address);
94
+ expect(actualSponsorWallet.address).toBe('0x228A54F33E46fbb32a62ca650Fcc9eD3C730511d');
95
+ });
96
+ });
72
97
 
73
- expect(throwingFn).toThrow(expect.objectContaining({ name: expect.stringContaining('Error') }));
74
- });
98
+ describe(deriveAirnodeXpub.name, () => {
99
+ it(`derives an airnode's xpub from a mnemonic`, () => {
100
+ const xpub = deriveAirnodeXpub('test test test test test test test test test test test junk');
75
101
 
76
- it('derives the same sponsor wallet as Airnode', () => {
77
- function deriveSponsorWalletAirnode(masterHDNode: ethers.utils.HDNode, sponsorAddress: Address): ethers.Wallet {
78
- const sponsorWalletHdNode = masterHDNode.derivePath(
79
- `m/44'/60'/0'/${deriveWalletPathFromSponsorAddress(sponsorAddress, '1')}`
80
- );
81
- return new ethers.Wallet(sponsorWalletHdNode.privateKey);
82
- }
83
- const mnemonic = 'achieve climb couple wait accident symbol spy blouse reduce foil echo label';
84
- const hdNode = ethers.utils.HDNode.fromMnemonic(mnemonic);
102
+ expect(xpub).toBe(
103
+ 'xpub6Ce9NcJvTk36xtLSrJLZqE7wtgA5deCeYs7rSQtreh4cj6ByPtrg9sD7V2FNFLPnf8heNP3FGkeV9qwfzvZNSd54JoNXVsXFYSYwHsnJxqP'
104
+ );
105
+ });
106
+ });
85
107
 
86
- // https://github.com/api3dao/airnode/blob/a4c17c28c8b31c9fb13d2828764b89f1063b702f/packages/airnode-node/src/evm/wallet.test.ts#L25
87
- const expectedSponsorWallet = deriveSponsorWalletAirnode(hdNode, '0x06f509f73eefba36352bc8228f9112c3786100da');
88
- const actualSponsorWallet = deriveSponsorWallet(mnemonic, '0x06f509f73eefba36352bc8228f9112c3786100da', '1');
108
+ describe(deriveEndpointId.name, () => {
109
+ it(`derives an endpoint ID`, () => {
110
+ const endpointId = deriveEndpointId('weather', 'temperature');
89
111
 
90
- expect(actualSponsorWallet.address).toBe(expectedSponsorWallet.address);
91
- expect(actualSponsorWallet.address).toBe('0x228A54F33E46fbb32a62ca650Fcc9eD3C730511d');
92
- });
112
+ expect(endpointId).toBe('0x5a82d40e44ecd3ef0906e9e82c1a20f2f4ffe4f613ac70f999047496a9cd4635');
113
+ });
114
+ });
93
115
 
94
- it(`derives an airnode's xpub from a mnemonic`, () => {
95
- const xpub = deriveAirnodeXpub('test test test test test test test test test test test junk');
116
+ describe(deriveTemplateIdV0.name, () => {
117
+ it(`it derives a template ID V0`, () => {
118
+ const templateId = deriveTemplateIdV0(
119
+ '0x4E95C31894a89CdC4288669A6F294836948c862b',
120
+ '0x5a82d40e44ecd3ef0906e9e82c1a20f2f4ffe4f613ac70f999047496a9cd4635',
121
+ '0x6466726f6d63455448'
122
+ );
96
123
 
97
- expect(xpub).toBe(
98
- 'xpub6Ce9NcJvTk36xtLSrJLZqE7wtgA5deCeYs7rSQtreh4cj6ByPtrg9sD7V2FNFLPnf8heNP3FGkeV9qwfzvZNSd54JoNXVsXFYSYwHsnJxqP'
99
- );
100
- });
124
+ expect(templateId).toBe('0x25ea8b12135e4b8d49960ef9e0f967b7c0ccad136b955fbb7fbeb76da27d60b0');
125
+ });
126
+ });
101
127
 
102
- it(`derives an endpoint ID`, () => {
103
- const endpointId = deriveEndpointId('weather', 'temperature');
128
+ describe(deriveTemplateIdV1.name, () => {
129
+ it('derives templateId for V1', () => {
130
+ const expectedTemplateIdV1 = deriveTemplateIdV1(
131
+ '0x2f3a3adf6daf5a3bb00ab83aa82262a6a84b59b0a89222386135330a1819ab48',
132
+ '0x6466726f6d63455448'
133
+ );
104
134
 
105
- expect(endpointId).toBe('0x5a82d40e44ecd3ef0906e9e82c1a20f2f4ffe4f613ac70f999047496a9cd4635');
106
- });
135
+ expect(expectedTemplateIdV1).toBe('0xe5d99287b5a870c3453bc0b42769c6f37cf4a3143890e9c34753181171fac842');
136
+ });
137
+ });
107
138
 
108
- it(`it derives a template ID V0`, () => {
109
- const templateId = deriveTemplateIdV0(
110
- '0x4E95C31894a89CdC4288669A6F294836948c862b',
111
- '0x5a82d40e44ecd3ef0906e9e82c1a20f2f4ffe4f613ac70f999047496a9cd4635',
112
- '0x6466726f6d63455448'
113
- );
139
+ describe(deriveBeaconId.name, () => {
140
+ it('derives a beacon ID', () => {
141
+ const beaconId = deriveBeaconId(
142
+ '0xc52EeA00154B4fF1EbbF8Ba39FDe37F1AC3B9Fd4',
143
+ '0x457a3b3da67e394a895ea49e534a4d91b2d009477bef15eab8cbed313925b010'
144
+ );
114
145
 
115
- expect(templateId).toBe('0x25ea8b12135e4b8d49960ef9e0f967b7c0ccad136b955fbb7fbeb76da27d60b0');
116
- });
146
+ expect(beaconId).toBe('0xf5c140bcb4814dfec311d38f6293e86c02d32ba1b7da027fe5b5202cae35dbc6');
147
+ });
148
+ });
117
149
 
118
- it('derives templateId for V1', () => {
119
- const expectedTemplateIdV1 = deriveTemplateIdV1(
120
- '0x2f3a3adf6daf5a3bb00ab83aa82262a6a84b59b0a89222386135330a1819ab48',
121
- '0x6466726f6d63455448'
122
- );
150
+ describe(deriveBeaconSetId.name, () => {
151
+ it(`derives a beacon set ID`, () => {
152
+ const beaconSetId = deriveBeaconSetId([
153
+ '0x0e30ed302a3c8eeaa0053caf5fbd0825c86ce1767584d12c69c310f0068b1176',
154
+ '0x496092597aef79595df1567412c6ddefd037f63a5a1572702dd469f62f31f469',
155
+ '0x84c1da28b2f29f0a2b0ff360d537d405d1cd69249fcf5f32ae9c2298cee6da12',
156
+ '0xe8655dc68f2b765c5e6d4a042ba7ba8606cf37e1c8c96676f85364ec5bfe9163',
157
+ '0xf5c140bcb4814dfec311d38f6293e86c02d32ba1b7da027fe5b5202cae35dbc6',
158
+ ]);
159
+
160
+ expect(beaconSetId).toBe('0x33bf380fd5b06a317a905b23eaf5c61ef0a9b4a20589a1bf1d13133daca34b0e');
161
+ });
162
+ });
123
163
 
124
- expect(expectedTemplateIdV1).toBe('0xe5d99287b5a870c3453bc0b42769c6f37cf4a3143890e9c34753181171fac842');
125
- });
164
+ describe(toBytes32String.name, () => {
165
+ it('encodes a string as a bytes32 string', () => {
166
+ const formattedString = toBytes32String('test string');
126
167
 
127
- it('derives a beacon ID', () => {
128
- const beaconId = deriveBeaconId(
129
- '0xc52EeA00154B4fF1EbbF8Ba39FDe37F1AC3B9Fd4',
130
- '0x457a3b3da67e394a895ea49e534a4d91b2d009477bef15eab8cbed313925b010'
131
- );
168
+ expect(formattedString).toBe('0x7465737420737472696e67000000000000000000000000000000000000000000');
169
+ });
170
+ });
132
171
 
133
- expect(beaconId).toBe('0xf5c140bcb4814dfec311d38f6293e86c02d32ba1b7da027fe5b5202cae35dbc6');
134
- });
172
+ describe(fromBytes32String.name, () => {
173
+ it('decodes a bytes32 string to a normal string', () => {
174
+ const formattedString = fromBytes32String('0x7465737420737472696e67000000000000000000000000000000000000000000');
135
175
 
136
- it(`derives a beacon set ID`, () => {
137
- const beaconSetId = deriveBeaconSetId([
138
- '0x0e30ed302a3c8eeaa0053caf5fbd0825c86ce1767584d12c69c310f0068b1176',
139
- '0x496092597aef79595df1567412c6ddefd037f63a5a1572702dd469f62f31f469',
140
- '0x84c1da28b2f29f0a2b0ff360d537d405d1cd69249fcf5f32ae9c2298cee6da12',
141
- '0xe8655dc68f2b765c5e6d4a042ba7ba8606cf37e1c8c96676f85364ec5bfe9163',
142
- '0xf5c140bcb4814dfec311d38f6293e86c02d32ba1b7da027fe5b5202cae35dbc6',
143
- ]);
176
+ expect(formattedString).toBe('test string');
177
+ });
178
+ });
179
+
180
+ describe(verifyAirnodeXpub.name, () => {
181
+ it('does not throw for valid xpub/airnode combination', () => {
182
+ expect(() =>
183
+ verifyAirnodeXpub(
184
+ 'xpub6CvZvZuFtPUtNirE36eMqYu8pRa1CEQuDon9tT4G8fisU3jj38Sn53TxdHb1SUvWiwVjJ68ytPZf45gnPM7Kg4g4CNTdyjJMevDQ1wk4tYD',
185
+ '0x02F5BD238B866c36f7d7b144D2889fB5e594474e'
186
+ )
187
+ ).not.toThrow();
188
+ });
189
+
190
+ it('throws when the xpub is invalid', () => {
191
+ expect(() =>
192
+ verifyAirnodeXpub(
193
+ 'xpub6CvZvZuFtPUtNirE36eMqYu8pRa1CEQuDon9tT4G8fisU3jj38Sn53TxdHb1SUvWiwVjJ68ytPZf45gnPM7Kg4g4CNTdyjJMevDQ1wk4tYD',
194
+ '0xDdfd47366cA427e75C26c9F3364EE37b33e1DD38'
195
+ )
196
+ ).toThrow('xpub does not belong to Airnode: 0xDdfd47366cA427e75C26c9F3364EE37b33e1DD38');
197
+ });
198
+ });
144
199
 
145
- expect(beaconSetId).toBe('0x33bf380fd5b06a317a905b23eaf5c61ef0a9b4a20589a1bf1d13133daca34b0e');
146
- });
200
+ describe(deriveSponsorWalletAddress, () => {
201
+ it('derives the sponsor wallet address and verifies airnode address', () => {
202
+ const sponsorWalletAddress = deriveSponsorWalletAddress(
203
+ 'xpub6CvZvZuFtPUtNirE36eMqYu8pRa1CEQuDon9tT4G8fisU3jj38Sn53TxdHb1SUvWiwVjJ68ytPZf45gnPM7Kg4g4CNTdyjJMevDQ1wk4tYD',
204
+ '0xE9232cde1f37B029dfbB403f79429f912D7405F3',
205
+ '1',
206
+ '0x02F5BD238B866c36f7d7b144D2889fB5e594474e'
207
+ );
147
208
 
148
- it('encodes a string as a bytes32 string', () => {
149
- const formattedString = toBytes32String('test string');
209
+ expect(sponsorWalletAddress).toBe('0xDdfd47366cA427e75C26c9F3364EE37b33e1DD38');
210
+ });
150
211
 
151
- expect(formattedString).toBe('0x7465737420737472696e67000000000000000000000000000000000000000000');
152
- });
212
+ it('derives the sponsor wallet without xpub verifification', () => {
213
+ const sponsorWalletAddress = deriveSponsorWalletAddress(
214
+ 'xpub6CvZvZuFtPUtNirE36eMqYu8pRa1CEQuDon9tT4G8fisU3jj38Sn53TxdHb1SUvWiwVjJ68ytPZf45gnPM7Kg4g4CNTdyjJMevDQ1wk4tYD',
215
+ '0xE9232cde1f37B029dfbB403f79429f912D7405F3',
216
+ '1'
217
+ );
153
218
 
154
- it('decodes a bytes32 string to a normal string', () => {
155
- const formattedString = fromBytes32String('0x7465737420737472696e67000000000000000000000000000000000000000000');
219
+ expect(sponsorWalletAddress).toBe('0xDdfd47366cA427e75C26c9F3364EE37b33e1DD38');
220
+ });
156
221
 
157
- expect(formattedString).toBe('test string');
158
- });
222
+ it('verifies that xpub is valid when airnode address is provided', () => {
223
+ expect(() =>
224
+ deriveSponsorWalletAddress(
225
+ 'xpub6CvZvZuFtPUtNirE36eMqYu8pRa1CEQuDon9tT4G8fisU3jj38Sn53TxdHb1SUvWiwVjJ68ytPZf45gnPM7Kg4g4CNTdyjJMevDQ1wk4tYD',
226
+ '0xE9232cde1f37B029dfbB403f79429f912D7405F3',
227
+ '1',
228
+ '0xA143283e75c8e0a3174d51e6ccA38B334E1D6b12'
229
+ )
230
+ ).toThrow('xpub does not belong to Airnode: 0xA143283e75c8e0a3174d51e6ccA38B334E1D6b12');
159
231
  });
160
232
  });
@@ -55,3 +55,26 @@ export const deriveBeaconId = (airnodeAddress: Address, templateId: Hex) =>
55
55
  export const deriveBeaconSetId = (beaconIds: Hex[]) =>
56
56
  // By convention beacon IDs are sorted alphabetically - the ordering impacts the resulting hash.
57
57
  ethers.utils.keccak256(ethers.utils.defaultAbiCoder.encode(['bytes32[]'], [beaconIds]));
58
+
59
+ export const deriveHdNodeFromXpub = (xpub: string) => ethers.utils.HDNode.fromExtendedKey(xpub);
60
+
61
+ export const verifyAirnodeXpub = (airnodeXpub: string, airnodeAddress: Address): ethers.utils.HDNode => {
62
+ // The xpub is expected to belong to the hardened path m/44'/60'/0' so we must derive the child default derivation
63
+ // path m/44'/60'/0'/0/0 to compare it and check if xpub belongs to the Airnode wallet.
64
+ const hdNode = deriveHdNodeFromXpub(airnodeXpub);
65
+ if (airnodeAddress !== hdNode.derivePath('0/0').address) {
66
+ throw new Error(`xpub does not belong to Airnode: ${airnodeAddress}`);
67
+ }
68
+ return hdNode;
69
+ };
70
+
71
+ export function deriveSponsorWalletAddress(
72
+ airnodeXpub: string,
73
+ sponsorAddress: Address,
74
+ protocolId: ProtocolId,
75
+ airnodeAddress?: Address
76
+ ) {
77
+ const hdNode = airnodeAddress ? verifyAirnodeXpub(airnodeXpub, airnodeAddress) : deriveHdNodeFromXpub(airnodeXpub);
78
+ const derivationPath = deriveWalletPathFromSponsorAddress(sponsorAddress, protocolId);
79
+ return hdNode.derivePath(derivationPath).address;
80
+ }
@@ -11,12 +11,9 @@ describe(extractAxiosErrorData.name, () => {
11
11
  } as any as AxiosResponse);
12
12
 
13
13
  expect(extractAxiosErrorData(axiosError)).toStrictEqual({
14
- axiosResponse: {
15
- data: 'error data',
16
- status: 500,
17
- },
18
- code: '500',
14
+ response: 'error data',
19
15
  message: 'error message',
16
+ code: '500',
20
17
  });
21
18
  });
22
19
  });
@@ -33,10 +30,11 @@ describe(executeRequest.name, () => {
33
30
  expect(response).toStrictEqual({
34
31
  data: undefined,
35
32
  errorData: {
36
- axiosResponse: undefined,
33
+ response: undefined,
37
34
  code: 'ECONNREFUSED',
38
35
  message: expect.any(String), // The message is empty in node@20, but "connect ECONNREFUSED ::1:9999" on node@18
39
36
  },
37
+ statusCode: undefined,
40
38
  success: false,
41
39
  });
42
40
  });
package/src/http/index.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { go } from '@api3/promise-utils';
2
2
  import axios, { type Method, type AxiosError, type AxiosResponse } from 'axios';
3
- import pick from 'lodash/pick';
4
3
 
5
4
  const DEFAULT_TIMEOUT_MS = 10_000;
6
5
 
@@ -14,7 +13,7 @@ export interface Request {
14
13
  }
15
14
 
16
15
  export interface ErrorResponse {
17
- readonly axiosResponse: Pick<AxiosResponse, 'data' | 'headers' | 'status'> | undefined;
16
+ readonly response: unknown;
18
17
  readonly message: string;
19
18
  readonly code: string | undefined;
20
19
  }
@@ -22,21 +21,23 @@ export interface ErrorResponse {
22
21
  export const extractAxiosErrorData = (error: AxiosError): ErrorResponse => {
23
22
  // Inspired by: https://axios-http.com/docs/handling_errors
24
23
  return {
25
- axiosResponse: error.response ? pick(error.response, ['data', 'status']) : undefined,
24
+ response: error.response?.data,
26
25
  message: error.message,
27
26
  code: error.code,
28
- } as ErrorResponse;
27
+ };
29
28
  };
30
29
 
31
30
  interface ExecuteRequestSuccess<T> {
32
31
  success: true;
33
32
  errorData: undefined;
34
33
  data: T;
34
+ statusCode: number;
35
35
  }
36
36
  interface ExecuteRequestError {
37
37
  success: false;
38
38
  errorData: ErrorResponse;
39
39
  data: undefined;
40
+ statusCode: number | undefined;
40
41
  }
41
42
 
42
43
  export type ExecuteRequestResult<T> = ExecuteRequestError | ExecuteRequestSuccess<T>;
@@ -54,8 +55,15 @@ export async function executeRequest<T>(request: Request): Promise<ExecuteReques
54
55
  timeout,
55
56
  })
56
57
  );
57
- if (!goAxios.success) return { success: false, errorData: extractAxiosErrorData(goAxios.error), data: undefined };
58
+ if (!goAxios.success) {
59
+ return {
60
+ success: false,
61
+ errorData: extractAxiosErrorData(goAxios.error),
62
+ data: undefined,
63
+ statusCode: goAxios.error.status,
64
+ };
65
+ }
58
66
  const response = goAxios.data;
59
67
 
60
- return { success: true, errorData: undefined, data: response.data };
68
+ return { success: true, errorData: undefined, data: response.data, statusCode: response.status };
61
69
  }