@sentio/sdk 2.0.0-rc.18 → 2.0.0-rc.19
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/lib/eth/provider.js +2 -11
- package/lib/eth/provider.js.map +1 -1
- package/package.json +6 -6
- package/src/eth/provider.ts +2 -11
package/lib/eth/provider.js
CHANGED
|
@@ -58,22 +58,13 @@ export function getProvider(networkish) {
|
|
|
58
58
|
// }
|
|
59
59
|
class QueuedStaticJsonRpcProvider extends JsonRpcProvider {
|
|
60
60
|
executor;
|
|
61
|
-
network;
|
|
62
61
|
constructor(url, network, concurrency) {
|
|
63
|
-
|
|
64
|
-
|
|
62
|
+
// TODO re-enable match when possible
|
|
63
|
+
super(url, network, { staticNetwork: network, batchMaxCount: 1 });
|
|
65
64
|
this.executor = new PQueue({ concurrency: concurrency });
|
|
66
65
|
}
|
|
67
66
|
send(method, params) {
|
|
68
67
|
return this.executor.add(() => super.send(method, params));
|
|
69
68
|
}
|
|
70
|
-
async _detectNetwork() {
|
|
71
|
-
return this.network;
|
|
72
|
-
}
|
|
73
|
-
get _network() {
|
|
74
|
-
return this.network;
|
|
75
|
-
}
|
|
76
|
-
// disable batch eth call
|
|
77
|
-
_start() { }
|
|
78
69
|
}
|
|
79
70
|
//# sourceMappingURL=provider.js.map
|
package/lib/eth/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAG3D,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAA;AAEpD,MAAM,UAAU,WAAW,CAAC,UAAuB;IACjD,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,CAAC,CAAA;KACf;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACxC,iCAAiC;IAEjC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9E,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,OAAO,CAAA;IACtD,IAAI,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,QAAQ,EAAE;QACZ,OAAO,QAAQ,CAAA;KAChB;IAED,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,KAAK,CACT,+BAA+B;YAC7B,OAAO,CAAC,OAAO;YACf,uBAAuB;YACvB,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACvD,CAAA;KACF;IACD,QAAQ,GAAG,IAAI,2BAA2B,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC1G,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAA;IACnD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,8GAA8G;AAC9G,+DAA+D;AAC/D,EAAE;AACF,uCAAuC;AACvC,gDAAgD;AAChD,iBAAiB;AACjB,QAAQ;AACR,EAAE;AACF,6CAA6C;AAC7C,yCAAyC;AACzC,EAAE;AACF,qDAAqD;AACrD,iDAAiD;AACjD,oEAAoE;AACpE,WAAW;AACX,wBAAwB;AACxB,+DAA+D;AAC/D,EAAE;AACF,0DAA0D;AAC1D,EAAE;AACF,0BAA0B;AAC1B,uDAAuD;AACvD,6CAA6C;AAC7C,eAAe;AACf,yEAAyE;AACzE,4CAA4C;AAC5C,QAAQ;AACR,EAAE;AACF,0DAA0D;AAC1D,MAAM;AACN,IAAI;AAEJ,MAAM,2BAA4B,SAAQ,eAAe;IACvD,QAAQ,CAAQ;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAG3D,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAA;AAEpD,MAAM,UAAU,WAAW,CAAC,UAAuB;IACjD,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,CAAC,CAAA;KACf;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACxC,iCAAiC;IAEjC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9E,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,OAAO,CAAA;IACtD,IAAI,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,QAAQ,EAAE;QACZ,OAAO,QAAQ,CAAA;KAChB;IAED,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,KAAK,CACT,+BAA+B;YAC7B,OAAO,CAAC,OAAO;YACf,uBAAuB;YACvB,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACvD,CAAA;KACF;IACD,QAAQ,GAAG,IAAI,2BAA2B,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC1G,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAA;IACnD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,8GAA8G;AAC9G,+DAA+D;AAC/D,EAAE;AACF,uCAAuC;AACvC,gDAAgD;AAChD,iBAAiB;AACjB,QAAQ;AACR,EAAE;AACF,6CAA6C;AAC7C,yCAAyC;AACzC,EAAE;AACF,qDAAqD;AACrD,iDAAiD;AACjD,oEAAoE;AACpE,WAAW;AACX,wBAAwB;AACxB,+DAA+D;AAC/D,EAAE;AACF,0DAA0D;AAC1D,EAAE;AACF,0BAA0B;AAC1B,uDAAuD;AACvD,6CAA6C;AAC7C,eAAe;AACf,yEAAyE;AACzE,4CAA4C;AAC5C,QAAQ;AACR,EAAE;AACF,0DAA0D;AAC1D,MAAM;AACN,IAAI;AAEJ,MAAM,2BAA4B,SAAQ,eAAe;IACvD,QAAQ,CAAQ;IAEhB,YAAY,GAAW,EAAE,OAAgB,EAAE,WAAmB;QAC5D,qCAAqC;QACrC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC,CAAA;QACjE,IAAI,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,IAAI,CAAC,MAAc,EAAE,MAAkB;QACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC5D,CAAC;CACF","sourcesContent":["import { Provider, Network, JsonRpcProvider } from 'ethers'\nimport { Networkish } from 'ethers/providers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getProvider(networkish?: Networkish): Provider {\n if (!networkish) {\n networkish = 1\n }\n const network = Network.from(networkish)\n // TODO check if other key needed\n\n const address = Endpoints.INSTANCE.chainServer.get(network.chainId.toString())\n const key = network.chainId.toString() + '-' + address\n let provider = providers.get(key)\n\n if (provider) {\n return provider\n }\n\n if (address === undefined) {\n throw Error(\n 'Provider not found for chain ' +\n network.chainId +\n ', configured chains: ' +\n [...Endpoints.INSTANCE.chainServer.keys()].join(' ')\n )\n }\n provider = new QueuedStaticJsonRpcProvider(address, Network.from(network), Endpoints.INSTANCE.concurrency)\n providers.set(network.chainId.toString(), provider)\n return provider\n}\n\n// export function setProvider(config: Record<string, ChainConfig>, concurrency = 4, useChainServer = false) {\n// Endpoints.INSTANCE.providers = new Map<bigint, Provider>()\n//\n// for (const chainIdStr in config) {\n// if (isNaN(Number.parseInt(chainIdStr))) {\n// continue\n// }\n//\n// const chainConfig = config[chainIdStr]\n// const chainId = BigInt(chainIdStr)\n//\n// // let providers: StaticJsonRpcProvider[] = []\n// // for (const http of chainConfig.Https) {\n// // providers.push(new StaticJsonRpcProvider(http, chainId))\n// // }\n// // random shuffle\n// // providers = providers.sort(() => Math.random() - 0.5)\n//\n// // const provider = new FallbackProvider(providers)\n//\n// let rpcAddress = ''\n// if (useChainServer && chainConfig.ChainServer) {\n// rpcAddress = chainConfig.ChainServer\n// } else {\n// const idx = Math.floor(Math.random() * chainConfig.Https.length)\n// rpcAddress = chainConfig.Https[idx]\n// }\n//\n// Endpoints.INSTANCE.providers.set(chainId, provider)\n// }\n// }\n\nclass QueuedStaticJsonRpcProvider extends JsonRpcProvider {\n executor: PQueue\n\n constructor(url: string, network: Network, concurrency: number) {\n // TODO re-enable match when possible\n super(url, network, { staticNetwork: network, batchMaxCount: 1 })\n this.executor = new PQueue({ concurrency: concurrency })\n }\n\n send(method: string, params: Array<any>): Promise<any> {\n return this.executor.add(() => super.send(method, params))\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sentio/sdk",
|
|
3
3
|
"license": "Apache-2.0",
|
|
4
|
-
"version": "2.0.0-rc.
|
|
4
|
+
"version": "2.0.0-rc.19",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"compile_typechain_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
|
|
@@ -19,16 +19,16 @@
|
|
|
19
19
|
"@project-serum/anchor": "^0.26.0",
|
|
20
20
|
"@sentio/bigdecimal": "^9.1.1-patch.3",
|
|
21
21
|
"@sentio/ethers-v6": "^1.0.24",
|
|
22
|
-
"@sentio/protos": "^2.0.0-rc.
|
|
23
|
-
"@sentio/runtime": "^2.0.0-rc.
|
|
24
|
-
"@sentio/sdk": "^2.0.0-rc.
|
|
22
|
+
"@sentio/protos": "^2.0.0-rc.19",
|
|
23
|
+
"@sentio/runtime": "^2.0.0-rc.19",
|
|
24
|
+
"@sentio/sdk": "^2.0.0-rc.19",
|
|
25
25
|
"@solana/web3.js": "^1.47.3",
|
|
26
26
|
"@types/prettier": "^2.7.2",
|
|
27
27
|
"aptos-sdk": "npm:@sentio/aptos@^1.6.0",
|
|
28
28
|
"bs58": "^5.0.0",
|
|
29
29
|
"chalk": "^5.2.0",
|
|
30
30
|
"csv-parse": "^5.3.0",
|
|
31
|
-
"ethers": "npm:@sentio/ethers@^6.0.0-patch.
|
|
31
|
+
"ethers": "npm:@sentio/ethers@^6.0.0-patch.2",
|
|
32
32
|
"google-protobuf": "^3.15.8",
|
|
33
33
|
"nice-grpc": "^2.0.0",
|
|
34
34
|
"p-queue": "^7.3.0",
|
|
@@ -72,5 +72,5 @@
|
|
|
72
72
|
"typedoc": {
|
|
73
73
|
"entryPoint": "./src/index.ts"
|
|
74
74
|
},
|
|
75
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "1fe5303cf8c75078018ab4d41de3318eb478ced0"
|
|
76
76
|
}
|
package/src/eth/provider.ts
CHANGED
|
@@ -70,23 +70,14 @@ export function getProvider(networkish?: Networkish): Provider {
|
|
|
70
70
|
|
|
71
71
|
class QueuedStaticJsonRpcProvider extends JsonRpcProvider {
|
|
72
72
|
executor: PQueue
|
|
73
|
-
network: Network
|
|
74
73
|
|
|
75
74
|
constructor(url: string, network: Network, concurrency: number) {
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
// TODO re-enable match when possible
|
|
76
|
+
super(url, network, { staticNetwork: network, batchMaxCount: 1 })
|
|
78
77
|
this.executor = new PQueue({ concurrency: concurrency })
|
|
79
78
|
}
|
|
80
79
|
|
|
81
80
|
send(method: string, params: Array<any>): Promise<any> {
|
|
82
81
|
return this.executor.add(() => super.send(method, params))
|
|
83
82
|
}
|
|
84
|
-
async _detectNetwork(): Promise<Network> {
|
|
85
|
-
return this.network
|
|
86
|
-
}
|
|
87
|
-
get _network(): Network {
|
|
88
|
-
return this.network
|
|
89
|
-
}
|
|
90
|
-
// disable batch eth call
|
|
91
|
-
_start(): void {}
|
|
92
83
|
}
|