@arken/node 1.5.3 → 1.5.4
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.
- package/.rush/temp/shrinkwrap-deps.json +2 -218
- package/build/index.d.ts +0 -3
- package/build/index.js +0 -3
- package/build/index.js.map +1 -1
- package/build/package.json +1 -14
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/web3.d.ts +7 -10
- package/build/web3.js +9 -11
- package/build/web3.js.map +1 -1
- package/index.ts +4 -4
- package/package.json +2 -15
- package/web3.ts +16 -15
package/build/web3.d.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import _Web3 from 'web3';
|
|
2
|
-
import HDWalletProvider from '@truffle/hdwallet-provider';
|
|
3
|
-
import { Contract } from '@ethersproject/contracts';
|
|
4
|
-
import { Web3Provider } from '@ethersproject/providers';
|
|
5
2
|
export declare const Web3: typeof _Web3;
|
|
6
|
-
export declare const getRandomProvider: (secret: any) =>
|
|
3
|
+
export declare const getRandomProvider: (HDWalletProvider: any, secret: any) => any;
|
|
7
4
|
export declare function iterateBlocks(app: any, name: any, address: any, fromBlock: any, toBlock: any, event: any, processLog: any, updateConfig: any): Promise<void>;
|
|
8
5
|
export declare const getAddress: (address: any) => any;
|
|
9
6
|
export declare function isValidRequest(web3: any, req: any): boolean;
|
|
@@ -12,13 +9,13 @@ export declare function getSignedRequest(web3: any, secret: any, data: any): Pro
|
|
|
12
9
|
hash: any;
|
|
13
10
|
data: any;
|
|
14
11
|
}>;
|
|
15
|
-
export declare function getTopicSignatureHex(topicSignature: any):
|
|
16
|
-
export declare function isAddress(value: any):
|
|
17
|
-
export declare function shortenAddress(address: any, chars?: number): string;
|
|
18
|
-
export declare function getContract(address: any, ABI: any, library: any, account: any):
|
|
12
|
+
export declare function getTopicSignatureHex(ethers: any, topicSignature: any): any;
|
|
13
|
+
export declare function isAddress(ethers: any, value: any): any;
|
|
14
|
+
export declare function shortenAddress(ethers: any, address: any, chars?: number): string;
|
|
15
|
+
export declare function getContract(ethers: any, address: any, ABI: any, library: any, account: any): any;
|
|
19
16
|
export declare function getSigner(library: any, account: any): any;
|
|
20
17
|
export declare function getProviderOrSigner(library: any, account: any): any;
|
|
21
18
|
export declare function encrypt(data: any, key: any): any;
|
|
22
19
|
export declare function decrypt(data: any, key: any): any;
|
|
23
|
-
export declare function toBytes32(text: any):
|
|
24
|
-
export default function getLibrary(provider: any):
|
|
20
|
+
export declare function toBytes32(ethers: any, text: any): any;
|
|
21
|
+
export default function getLibrary(ethers: any, provider: any): any;
|
package/build/web3.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import _Web3 from 'web3';
|
|
2
|
-
import HDWalletProvider from '@truffle/hdwallet-provider';
|
|
3
2
|
import CryptoJS from 'crypto-js';
|
|
4
|
-
import { ethers } from 'ethers';
|
|
5
3
|
import { log, logError } from './log';
|
|
6
4
|
export const Web3 = _Web3;
|
|
7
|
-
export const getRandomProvider = (secret) => {
|
|
5
|
+
export const getRandomProvider = (HDWalletProvider, secret) => {
|
|
8
6
|
return new HDWalletProvider(secret.mnemonic, process.env.PROVIDER_URI);
|
|
9
7
|
};
|
|
10
8
|
export async function iterateBlocks(app, name, address, fromBlock, toBlock, event, processLog, updateConfig) {
|
|
@@ -67,10 +65,10 @@ export async function getSignedRequest(web3, secret, data) {
|
|
|
67
65
|
return null;
|
|
68
66
|
}
|
|
69
67
|
}
|
|
70
|
-
export function getTopicSignatureHex(topicSignature) {
|
|
68
|
+
export function getTopicSignatureHex(ethers, topicSignature) {
|
|
71
69
|
return ethers.utils.id(topicSignature);
|
|
72
70
|
}
|
|
73
|
-
export function isAddress(value) {
|
|
71
|
+
export function isAddress(ethers, value) {
|
|
74
72
|
try {
|
|
75
73
|
return ethers.utils.getAddress(value);
|
|
76
74
|
}
|
|
@@ -78,15 +76,15 @@ export function isAddress(value) {
|
|
|
78
76
|
return false;
|
|
79
77
|
}
|
|
80
78
|
}
|
|
81
|
-
export function shortenAddress(address, chars = 4) {
|
|
82
|
-
const parsed = isAddress(address);
|
|
79
|
+
export function shortenAddress(ethers, address, chars = 4) {
|
|
80
|
+
const parsed = isAddress(ethers, address);
|
|
83
81
|
if (!parsed) {
|
|
84
82
|
throw Error(`Invalid 'address' parameter '${address}'.`);
|
|
85
83
|
}
|
|
86
84
|
return `${parsed.substring(0, chars + 2)}...${parsed.substring(42 - chars)}`;
|
|
87
85
|
}
|
|
88
|
-
export function getContract(address, ABI, library, account) {
|
|
89
|
-
if (!isAddress(address) || address === ethers.constants.AddressZero) {
|
|
86
|
+
export function getContract(ethers, address, ABI, library, account) {
|
|
87
|
+
if (!isAddress(ethers, address) || address === ethers.constants.AddressZero) {
|
|
90
88
|
throw Error(`Invalid 'address' parameter '${address}'.`);
|
|
91
89
|
}
|
|
92
90
|
return new ethers.Contract(address, ABI, getProviderOrSigner(library, account));
|
|
@@ -103,7 +101,7 @@ export function encrypt(data, key) {
|
|
|
103
101
|
export function decrypt(data, key) {
|
|
104
102
|
return CryptoJS.AES.decrypt(data, key).toString(CryptoJS.enc.Utf8);
|
|
105
103
|
}
|
|
106
|
-
export function toBytes32(text) {
|
|
104
|
+
export function toBytes32(ethers, text) {
|
|
107
105
|
let data = ethers.utils.toUtf8Bytes(text);
|
|
108
106
|
if (data.length > 32) {
|
|
109
107
|
throw new Error('too long');
|
|
@@ -111,7 +109,7 @@ export function toBytes32(text) {
|
|
|
111
109
|
data = ethers.utils.zeroPad(data, 32);
|
|
112
110
|
return ethers.utils.hexlify(data);
|
|
113
111
|
}
|
|
114
|
-
export default function getLibrary(provider) {
|
|
112
|
+
export default function getLibrary(ethers, provider) {
|
|
115
113
|
const library = new ethers.providers.Web3Provider(provider);
|
|
116
114
|
library.pollingInterval = 15000;
|
|
117
115
|
return library;
|
package/build/web3.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web3.js","sourceRoot":"","sources":["../web3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"web3.js","sourceRoot":"","sources":["../web3.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import crypto from 'crypto';
|
|
2
2
|
import { exec } from 'child_process';
|
|
3
3
|
// import jetpack from 'fs-jetpack';
|
|
4
|
-
import * as ethers from 'ethers';
|
|
4
|
+
// import * as ethers from 'ethers';
|
|
5
5
|
import _ from 'lodash';
|
|
6
6
|
import config from './config';
|
|
7
7
|
import * as time from './time';
|
|
@@ -52,9 +52,9 @@ export function removeDupes(list) {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
export const toLong = (x, decimals = 16) =>
|
|
56
|
-
|
|
57
|
-
export const toShort = (x) => round(parseFloat(ethers.utils.formatEther(x)), 4);
|
|
55
|
+
// export const toLong = (x, decimals = 16) =>
|
|
56
|
+
// decimals === 16 ? ethers.utils.parseEther(x + '') : ethers.utils.parseUnits(x + '', decimals);
|
|
57
|
+
// export const toShort = (x) => round(parseFloat(ethers.utils.formatEther(x)), 4);
|
|
58
58
|
|
|
59
59
|
let updatingGit = false;
|
|
60
60
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arken/node",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"types": "build/types.d.ts",
|
|
@@ -15,15 +15,8 @@
|
|
|
15
15
|
"zk:regen-updateLeaf": "ts-node scripts/zk-regen-updateLeaf.ts"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@ethersproject/address": "^5",
|
|
19
|
-
"@ethersproject/constants": "^5",
|
|
20
|
-
"@ethersproject/contracts": "^5",
|
|
21
|
-
"@ethersproject/networks": "^5",
|
|
22
|
-
"@ethersproject/providers": "^5",
|
|
23
|
-
"@ethersproject/solidity": "^5",
|
|
24
18
|
"@trpc/server": "11.0.0-rc.660",
|
|
25
19
|
"@trpc/client": "11.0.0-rc.660",
|
|
26
|
-
"@truffle/hdwallet-provider": "^1",
|
|
27
20
|
"@typechain/ethers-v4": "^1",
|
|
28
21
|
"axios": "^1",
|
|
29
22
|
"compromise": "^14",
|
|
@@ -31,19 +24,14 @@
|
|
|
31
24
|
"crypto-js": "^4",
|
|
32
25
|
"dayjs": "^1",
|
|
33
26
|
"es6-promise": "^4",
|
|
34
|
-
"ethers": "^5",
|
|
35
|
-
"franc": "^6",
|
|
36
27
|
"fs-jetpack": "^4",
|
|
37
28
|
"js-md5": "^0",
|
|
38
|
-
"knex": "^0",
|
|
39
29
|
"langdetect": "^0",
|
|
40
30
|
"lodash": "^4",
|
|
41
31
|
"lokijs": "^1",
|
|
42
32
|
"moment": "^2",
|
|
43
33
|
"mongoose": "^8",
|
|
44
|
-
"natural": "^7",
|
|
45
34
|
"node-fetch": "^3",
|
|
46
|
-
"objection": "^2",
|
|
47
35
|
"openai": "^4",
|
|
48
36
|
"pluralize": "^8",
|
|
49
37
|
"puppeteer": "^22",
|
|
@@ -55,6 +43,7 @@
|
|
|
55
43
|
"web3": "^1",
|
|
56
44
|
"zod": "^3",
|
|
57
45
|
"rxjs": "^7",
|
|
46
|
+
"natural": "^7",
|
|
58
47
|
"fast-safe-stringify": "^2",
|
|
59
48
|
"@types/socket.io-client": "~3.0.0",
|
|
60
49
|
"otplib": "~12.0.1",
|
|
@@ -66,14 +55,12 @@
|
|
|
66
55
|
},
|
|
67
56
|
"devDependencies": {
|
|
68
57
|
"@types/common-tags": "^1",
|
|
69
|
-
"@types/ethereum-protocol": "^1",
|
|
70
58
|
"@types/jest": "^29",
|
|
71
59
|
"@types/lodash": "^4",
|
|
72
60
|
"@types/mongoose": "^5",
|
|
73
61
|
"@types/node": "^20",
|
|
74
62
|
"@types/react": "^18",
|
|
75
63
|
"@types/react-dom": "^18",
|
|
76
|
-
"@types/web3": "^1",
|
|
77
64
|
"@typescript-eslint/eslint-plugin": "^8",
|
|
78
65
|
"@typescript-eslint/parser": "^8",
|
|
79
66
|
"del-cli": "^5",
|
package/web3.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import md5 from 'js-md5';
|
|
2
2
|
import _Web3 from 'web3';
|
|
3
|
-
import HDWalletProvider from '@truffle/hdwallet-provider';
|
|
3
|
+
// import HDWalletProvider from '@truffle/hdwallet-provider';
|
|
4
4
|
import CryptoJS from 'crypto-js';
|
|
5
|
-
import ethersAddress from '@ethersproject/address';
|
|
6
|
-
import { Contract } from '@ethersproject/contracts';
|
|
7
|
-
import { Web3Provider } from '@ethersproject/providers';
|
|
8
|
-
import { ethers } from 'ethers';
|
|
5
|
+
// import ethersAddress from '@ethersproject/address';
|
|
6
|
+
// import { Contract } from '@ethersproject/contracts';
|
|
7
|
+
// import { Web3Provider } from '@ethersproject/providers';
|
|
8
|
+
// import { ethers } from 'ethers';
|
|
9
9
|
import { log, logError } from './log';
|
|
10
10
|
|
|
11
11
|
// const fetchPrice = async (id, vs = 'usd') => {
|
|
@@ -20,7 +20,7 @@ import { log, logError } from './log';
|
|
|
20
20
|
|
|
21
21
|
export const Web3 = _Web3;
|
|
22
22
|
|
|
23
|
-
export const getRandomProvider = (secret) => {
|
|
23
|
+
export const getRandomProvider = (HDWalletProvider, secret) => {
|
|
24
24
|
return new HDWalletProvider(
|
|
25
25
|
secret.mnemonic,
|
|
26
26
|
process.env.PROVIDER_URI //networks[Math.floor(Math.random() * networks.length)]
|
|
@@ -110,12 +110,12 @@ export async function getSignedRequest(web3, secret, data) {
|
|
|
110
110
|
}
|
|
111
111
|
|
|
112
112
|
// Get the topic signature hex
|
|
113
|
-
export function getTopicSignatureHex(topicSignature) {
|
|
113
|
+
export function getTopicSignatureHex(ethers, topicSignature) {
|
|
114
114
|
return ethers.utils.id(topicSignature);
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
// Returns the checksummed address if the address is valid, otherwise returns false
|
|
118
|
-
export function isAddress(value) {
|
|
118
|
+
export function isAddress(ethers, value) {
|
|
119
119
|
try {
|
|
120
120
|
return ethers.utils.getAddress(value);
|
|
121
121
|
} catch {
|
|
@@ -124,8 +124,8 @@ export function isAddress(value) {
|
|
|
124
124
|
}
|
|
125
125
|
|
|
126
126
|
// Shorten the checksummed version of the input address to have 0x + 4 characters at start and end
|
|
127
|
-
export function shortenAddress(address, chars = 4) {
|
|
128
|
-
const parsed = isAddress(address);
|
|
127
|
+
export function shortenAddress(ethers, address, chars = 4) {
|
|
128
|
+
const parsed = isAddress(ethers, address);
|
|
129
129
|
if (!parsed) {
|
|
130
130
|
throw Error(`Invalid 'address' parameter '${address}'.`);
|
|
131
131
|
}
|
|
@@ -133,8 +133,9 @@ export function shortenAddress(address, chars = 4) {
|
|
|
133
133
|
}
|
|
134
134
|
|
|
135
135
|
// account is optional
|
|
136
|
-
export function getContract(address, ABI, library, account) {
|
|
137
|
-
|
|
136
|
+
export function getContract(ethers, address, ABI, library, account) {
|
|
137
|
+
// pass in ethers
|
|
138
|
+
if (!isAddress(ethers, address) || address === ethers.constants.AddressZero) {
|
|
138
139
|
throw Error(`Invalid 'address' parameter '${address}'.`);
|
|
139
140
|
}
|
|
140
141
|
|
|
@@ -159,7 +160,7 @@ export function decrypt(data, key) {
|
|
|
159
160
|
return CryptoJS.AES.decrypt(data, key).toString(CryptoJS.enc.Utf8);
|
|
160
161
|
}
|
|
161
162
|
|
|
162
|
-
export function toBytes32(text) {
|
|
163
|
+
export function toBytes32(ethers, text) {
|
|
163
164
|
let data = ethers.utils.toUtf8Bytes(text);
|
|
164
165
|
if (data.length > 32) {
|
|
165
166
|
throw new Error('too long');
|
|
@@ -168,8 +169,8 @@ export function toBytes32(text) {
|
|
|
168
169
|
return ethers.utils.hexlify(data);
|
|
169
170
|
}
|
|
170
171
|
|
|
171
|
-
export default function getLibrary(provider) {
|
|
172
|
-
const library = new ethers.providers.Web3Provider(provider);
|
|
172
|
+
export default function getLibrary(ethers, provider) {
|
|
173
|
+
const library = new ethers.providers.Web3Provider(provider); // pass in ethers.providers.Web3Provider
|
|
173
174
|
library.pollingInterval = 15000;
|
|
174
175
|
return library;
|
|
175
176
|
}
|