move dd wrapped provider to rpc adapter pkg (#913)

* wip

* basic example works

* add doc and polish

* move dd wrapped provider to rpc adapter pkg

* fix

Author: shunjizhan

packages/eth-providers/package.json

@@ -17,7 +17,6 @@
     "@acala-network/contracts": "4.3.4",
     "@acala-network/eth-transactions": "workspace:*",
     "bn.js": "~5.2.0",
-    "dd-trace": "~4.16.0",
     "ethers": "~5.7.0",
     "graphql": "~16.0.1",
     "graphql-request": "~3.6.1",
@@ -26,7 +25,6 @@
   "devDependencies": {
     "@acala-network/api": "~6.0.4",
     "@types/bn.js": "~5.1.0",
-    "@types/dd-trace": "^0.9.0",
     "@types/lru-cache": "~7.6.1",
     "dotenv": "~10.0.0",
     "jsdom": "^22.0.0",

packages/eth-providers/src/rpc-provider.ts

@@ -2,7 +2,6 @@ import { options } from '@acala-network/api';
 
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { BaseProvider, BaseProviderOptions } from './base-provider';
-import { BaseProviderWithTrace } from './base-provider-dd';
 
 export class EvmRpcProvider extends BaseProvider {
   constructor(endpoint: string | string[], opts?: BaseProviderOptions) {
@@ -18,18 +17,3 @@ export class EvmRpcProvider extends BaseProvider {
     return new EvmRpcProvider(endpoint, opt);
   }
 }
-
-export class EvmRpcProviderWithTrace extends BaseProviderWithTrace {
-  constructor(endpoint: string | string[], opts?: BaseProviderOptions) {
-    super(opts);
-
-    const provider = new WsProvider(endpoint);
-    const api = new ApiPromise(options({ provider }));
-
-    this.setApi(api);
-  }
-
-  static from(endpoint: string | string[], opt?: BaseProviderOptions): EvmRpcProviderWithTrace {
-    return new EvmRpcProviderWithTrace(endpoint, opt);
-  }
-}

packages/eth-rpc-adapter/src/eip1193-bridge.ts

@@ -1,6 +1,5 @@
 import {
   EvmRpcProvider,
-  EvmRpcProviderWithTrace,
   PROVIDER_ERRORS,
   PollFilterType,
   TX,
@@ -13,6 +12,7 @@ import { hexValue } from '@ethersproject/bytes';
 import EventEmitter from 'events';
 import WebSocket from 'ws';
 
+import { EvmRpcProviderWithTrace } from './wrapped-provider';
 import { InvalidParams, MethodNotFound } from './errors';
 import { validate } from './validate';
 import { version } from './_version';

packages/eth-rpc-adapter/src/index.ts

@@ -1,7 +1,7 @@
 import './utils/tracer';
 
 import { Eip1193Bridge } from './eip1193-bridge';
-import { EvmRpcProviderWithTrace } from '@acala-network/eth-providers';
+import { EvmRpcProviderWithTrace } from './wrapped-provider';
 import { Router } from './router';
 import { monitorRuntime } from './utils/monitor-runtime';
 import { yargsOptions as opts } from './utils';

packages/eth-providers/src/base-provider-dd.ts renamed to packages/eth-rpc-adapter/src/wrapped-provider.ts

@@ -1,4 +1,6 @@
-import { BaseProvider } from './base-provider';
+import { ApiPromise, WsProvider } from '@polkadot/api';
+import { BaseProvider, BaseProviderOptions } from '@acala-network/eth-providers/base-provider';
+import { options } from '@acala-network/api';
 import tracer from 'dd-trace';
 
 const TRACE_METHODS = [
@@ -79,3 +81,18 @@ export class BaseProviderWithTrace extends BaseProvider {
     }
   }
 }
+
+export class EvmRpcProviderWithTrace extends BaseProviderWithTrace {
+  constructor(endpoint: string | string[], opts?: BaseProviderOptions) {
+    super(opts);
+
+    const provider = new WsProvider(endpoint);
+    const api = new ApiPromise(options({ provider }));
+
+    this.setApi(api);
+  }
+
+  static from(endpoint: string | string[], opt?: BaseProviderOptions): EvmRpcProviderWithTrace {
+    return new EvmRpcProviderWithTrace(endpoint, opt);
+  }
+}