feat(sdk): migrate to ethers-js6, cleanup deps (#BREAKING CHANGE ) (#316

)
sentioxyz · Feb 1, 2023 · b57184f · b57184f
1 parent 2084825
commit b57184f
Show file tree

Hide file tree

Showing 94 changed files with 1,357 additions and 989 deletions.
diff --git a/.ls-lint.yml b/.ls-lint.yml
@@ -22,6 +22,7 @@ ignore:
   - .git
   - .idea
   - .github
+  - tsconfig.mjs.json
   - docs
   - node_modules
   - packages/cli/node_modules

diff --git a/examples/aptos/package.json b/examples/aptos/package.json
@@ -11,10 +11,10 @@
     "cli": "ts-node --files src/cli.ts"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development",
-    "@sentio/sdk-aptos": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development",
+    "@sentio/sdk-aptos": "^2.0.0-development"
   },
   "devDependencies": {
-    "@sentio/cli": "^1.0.0-development"
+    "@sentio/cli": "^2.0.0-development"
   }
 }
diff --git a/examples/aptos/tsconfig.json b/examples/aptos/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.mjs.json",
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "./src"

diff --git a/examples/aurory/package.json b/examples/aurory/package.json
@@ -10,10 +10,10 @@
     "build_all": "yarn lerna run --scope=@sentio-example/aurory build --include-dependencies"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development",
-    "@sentio/sdk-solana": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development",
+    "@sentio/sdk-solana": "^2.0.0-development"
   },
   "devDependencies": {
-    "@sentio/cli": "^1.0.0-development"
+    "@sentio/cli": "^2.0.0-development"
   }
 }
diff --git a/examples/sui/package.json b/examples/sui/package.json
@@ -10,9 +10,9 @@
     "build_all": "yarn lerna run --scope=@sentio-example/sui build --include-dependencies"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@sentio/cli": "^1.0.0-development"
+    "@sentio/cli": "^2.0.0-development"
   }
 }
diff --git a/examples/sui/tsconfig.json b/examples/sui/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.mjs.json",
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "./src"

diff --git a/examples/wormhole/package.json b/examples/wormhole/package.json
@@ -10,10 +10,10 @@
     "build_all": "yarn lerna run --scope=@sentio-example/wormhole build --include-dependencies"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development",
-    "@sentio/sdk-solana": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development",
+    "@sentio/sdk-solana": "^2.0.0-development"
   },
   "devDependencies": {
-    "@sentio/cli": "^1.0.0-development"
+    "@sentio/cli": "^2.0.0-development"
   }
 }
diff --git a/examples/wormhole/src/processor.ts b/examples/wormhole/src/processor.ts
@@ -12,15 +12,15 @@ const transferFilters = [
 
 WETH9Processor.bind({ address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', startBlock: 13217349 })
   .onEventDeposit(async function (event, ctx) {
-    const amount = Number(event.args.wad.toBigInt()) / Math.pow(10, 18)
+    const amount = Number(event.args.wad) / Math.pow(10, 18)
     ctx.meter.Counter('token_bridge_weth').add(amount)
   }, depositFilter)
   .onEventWithdrawal(async function (event, ctx) {
-    const amount = Number(event.args.wad.toBigInt()) / Math.pow(10, 18)
+    const amount = Number(event.args.wad) / Math.pow(10, 18)
     ctx.meter.Counter('token_bridge_weth').sub(amount)
   }, withdrawalFilter)
   .onEventTransfer(async function (event, ctx) {
-    const amount = Number(event.args.wad.toBigInt()) / Math.pow(10, 18)
+    const amount = Number(event.args.wad) / Math.pow(10, 18)
 
     if (event.args.src == TOKEN_BRIDGE_ADDRESS) {
       ctx.meter.Counter('token_bridge_weth').sub(amount)
@@ -32,7 +32,7 @@ WETH9Processor.bind({ address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', sta
 
 WETH9Processor.bind({ address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', startBlock: 13217349 }).onBlock(
   async function (_, ctx: WETH9Context) {
-    const balance = (await ctx.contract.balanceOf(TOKEN_BRIDGE_ADDRESS)).toBigInt()
+    const balance = await ctx.contract.balanceOf(TOKEN_BRIDGE_ADDRESS)
     ctx.meter.Gauge('balance').record(balance)
   }
 )
@@ -42,7 +42,7 @@ WETH9Processor.bind({
   startBlock: 13217349,
   endBlock: 14500000,
 }).onBlock(async function (_, ctx: WETH9Context) {
-  const balance = (await ctx.contract.balanceOf(TOKEN_BRIDGE_ADDRESS)).toBigInt()
+  const balance = await ctx.contract.balanceOf(TOKEN_BRIDGE_ADDRESS)
   ctx.meter.Gauge('balance_end').record(balance)
 })
 

diff --git a/examples/wormhole/tsconfig.json b/examples/wormhole/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.mjs.json",
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "./src"

diff --git a/examples/x2y2-complex/package.json b/examples/x2y2-complex/package.json
@@ -12,10 +12,10 @@
     "build_all": "yarn lerna run --scope=@sentio-example/x2y2-complex build --include-dependencies"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@sentio/cli": "^1.0.0-development",
+    "@sentio/cli": "^2.0.0-development",
     "ts-node": "^10.8.0"
   }
 }
diff --git a/examples/x2y2-complex/tsconfig.json b/examples/x2y2-complex/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.mjs.json",
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "./src"

diff --git a/examples/x2y2/package.json b/examples/x2y2/package.json
@@ -12,10 +12,10 @@
     "build_all": "yarn lerna run --scope=@sentio-example/x2y2 build --include-dependencies"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@sentio/cli": "^1.0.0-development",
+    "@sentio/cli": "^2.0.0-development",
     "ts-node": "^10.8.0"
   }
 }
diff --git a/examples/x2y2/tsconfig.json b/examples/x2y2/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.mjs.json",
   "compilerOptions": {
     "outDir": "dist",
     "rootDir": "./src"

diff --git a/package.json b/package.json
@@ -34,6 +34,9 @@
     "typedoc": "^0.23.23",
     "typescript": "^4.9.0"
   },
+  "resolutions": {
+    "ethers": "npm:@sentio/[email protected]"
+  },
   "scripts": {
     "format": "prettier --write .",
     "lint": "ls-lint && eslint .",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -2,7 +2,7 @@
   "name": "@sentio/cli",
   "license": "Apache-2.0",
   "private": true,
-  "version": "1.0.0-development",
+  "version": "2.0.0-development",
   "scripts": {
     "compile": "tsc -p . && cp src/webpack.config.js lib/",
     "build": "yarn compile",
@@ -31,7 +31,7 @@
     "@types/command-line-usage": "^5.0.2",
     "@types/expect": "^24.3.0",
     "@types/express": "^4.17.14",
-    "@types/fs-extra": "^9.0.13",
+    "@types/fs-extra": "^11.0.1",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^18.0.4",
     "@types/node-fetch": "^2.6.2"

diff --git a/packages/cli/templates/aptos/package.json b/packages/cli/templates/aptos/package.json
@@ -9,8 +9,8 @@
     "upload": "sentio upload"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development",
-    "@sentio/sdk-aptos": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development",
+    "@sentio/sdk-aptos": "^2.0.0-development"
   },
   "devDependencies": {
     "@types/jest": "^29.0.0",

diff --git a/packages/cli/templates/aptos/tsconfig.json b/packages/cli/templates/aptos/tsconfig.json
@@ -6,8 +6,8 @@
     "esModuleInterop": true,
     "noImplicitReturns": true,
     "noImplicitAny": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "esnext",
+    "moduleResolution": "node16",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,

diff --git a/packages/cli/templates/evm/package.json b/packages/cli/templates/evm/package.json
@@ -9,7 +9,7 @@
     "upload": "sentio upload"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
     "@types/jest": "^29.0.0",

diff --git a/packages/cli/templates/evm/src/processor.test.ts b/packages/cli/templates/evm/src/processor.test.ts
@@ -1,6 +1,5 @@
 import { TestProcessorServer, firstCounterValue } from '@sentio/sdk/lib/testing'
 import { mockTransferLog } from '@sentio/sdk/lib/builtin/erc20/test-utils'
-import { BigNumber } from 'ethers'
 
 describe('Test Processor', () => {
   const service = new TestProcessorServer(() => require('./processor'))
@@ -19,7 +18,7 @@ describe('Test Processor', () => {
       mockTransferLog('0x1e4ede388cbc9f4b5c79681b7f94d36a11abebc9', {
         from: '0x0000000000000000000000000000000000000000',
         to: '0xb329e39ebefd16f40d38f07643652ce17ca5bac1',
-        value: BigNumber.from(10n ** 18n * 10n),
+        value: 10n ** 18n * 10n,
       })
     )
 

diff --git a/packages/cli/templates/evm/tsconfig.json b/packages/cli/templates/evm/tsconfig.json
@@ -6,8 +6,8 @@
     "esModuleInterop": true,
     "noImplicitReturns": true,
     "noImplicitAny": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "esnext",
+    "moduleResolution": "node16",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,

diff --git a/packages/cli/templates/raw/package.json b/packages/cli/templates/raw/package.json
@@ -9,7 +9,7 @@
     "upload": "sentio upload"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
     "@types/jest": "^29.0.0",

diff --git a/packages/cli/templates/raw/tsconfig.json b/packages/cli/templates/raw/tsconfig.json
@@ -6,8 +6,8 @@
     "esModuleInterop": true,
     "noImplicitReturns": true,
     "noImplicitAny": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "esnext",
+    "moduleResolution": "node16",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,

diff --git a/packages/cli/templates/solana/package.json b/packages/cli/templates/solana/package.json
@@ -9,8 +9,8 @@
     "upload": "sentio upload"
   },
   "dependencies": {
-    "@sentio/sdk": "^1.0.0-development",
-    "@sentio/sdk-solana": "^1.0.0-development"
+    "@sentio/sdk": "^2.0.0-development",
+    "@sentio/sdk-solana": "^2.0.0-development"
   },
   "devDependencies": {
     "@types/jest": "^29.0.0",

diff --git a/packages/cli/templates/solana/tsconfig.json b/packages/cli/templates/solana/tsconfig.json
@@ -6,8 +6,8 @@
     "esModuleInterop": true,
     "noImplicitReturns": true,
     "noImplicitAny": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "esnext",
+    "moduleResolution": "node16",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,

diff --git a/packages/protos/package.json b/packages/protos/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentio/protos",
   "license": "Apache-2.0",
-  "version": "1.0.0-development",
+  "version": "2.0.0-development",
   "scripts": {
     "compile": "tsc -p .",
     "clean": "tsc --build --clean",

diff --git a/packages/runtime/chains-config.json b/packages/runtime/chains-config.json
@@ -1,22 +1,6 @@
 {
   "1": {
     "ChainID": "1",
-    "Https": [
-      "https://mainnet.infura.io/v3/6d3fecb13dea4c6086e1984b4a520fd0",
-      "https://mainnet.infura.io/v3/226c57463e9247bdaf7c402aa42fd259",
-      "https://mainnet.infura.io/v3/b27d64c4cb6343389f5a01a52dce19ab",
-      "https://mainnet.infura.io/v3/e55d25edf30f44e1ab6c09111d44bc49",
-      "https://mainnet.infura.io/v3/86922264d8de4635bbcc0c286cc18e76",
-      "https://mainnet.infura.io/v3/7b62d78dcf314d758318af8efc2046b1"
-    ],
-    "WebSockets": [
-      "wss://mainnet.infura.io/ws/v3/6d3fecb13dea4c6086e1984b4a520fd0",
-      "wss://mainnet.infura.io/ws/v3/226c57463e9247bdaf7c402aa42fd259",
-      "wss://mainnet.infura.io/ws/v3/b27d64c4cb6343389f5a01a52dce19ab",
-      "wss://mainnet.infura.io/ws/v3/e55d25edf30f44e1ab6c09111d44bc49",
-      "wss://mainnet.infura.io/ws/v3/86922264d8de4635bbcc0c286cc18e76",
-      "wss://mainnet.infura.io/ws/v3/7b62d78dcf314d758318af8efc2046b1"
-    ],
     "ChainServer": "",
     "BatchSize": 2000,
     "ReorgThresholdBlocks": 30,
@@ -25,14 +9,6 @@
   },
   "3": {
     "ChainID": "3",
-    "Https": [
-      "https://ropsten.infura.io/v3/1e2099a68b354e6db3649b9e75fe17b9",
-      "https://ropsten.infura.io/v3/ec4bc1d370134f06a05dc7ffc735d8f5"
-    ],
-    "WebSockets": [
-      "wss://ropsten.infura.io/ws/v3/1e2099a68b354e6db3649b9e75fe17b9",
-      "wss://ropsten.infura.io/ws/v3/ec4bc1d370134f06a05dc7ffc735d8f5"
-    ],
     "ChainServer": "",
     "BatchSize": 2000,
     "ReorgThresholdBlocks": 300,
@@ -41,16 +17,6 @@
   },
   "56": {
     "ChainID": "56",
-    "Https": [
-      "https://winter-withered-feather.bsc.discover.quiknode.pro/09cdc3b22506509b3fc49cb52448419d5e302ea1/",
-      "https://red-wandering-tree.bsc.discover.quiknode.pro/88d316a3d174489011af3c9cb3dd940fdff7880b/",
-      "https://morning-fragrant-silence.bsc.discover.quiknode.pro/7c6d4b06289c2dbaadce00f3b0a465d48c3f0753/"
-    ],
-    "WebSockets": [
-      "wss://winter-withered-feather.bsc.discover.quiknode.pro/09cdc3b22506509b3fc49cb52448419d5e302ea1/",
-      "wss://red-wandering-tree.bsc.discover.quiknode.pro/88d316a3d174489011af3c9cb3dd940fdff7880b/",
-      "wss://morning-fragrant-silence.bsc.discover.quiknode.pro/7c6d4b06289c2dbaadce00f3b0a465d48c3f0753/"
-    ],
     "ChainServer": "",
     "BatchSize": 2000,
     "ReorgThresholdBlocks": 30,
@@ -59,10 +25,6 @@
   },
   "SOL_mainnet": {
     "ChainID": "SOL_mainnet",
-    "Https": [
-      "https://solana-mainnet.g.alchemy.com/v2/AIM3Qp8rkxBoAjRCNeazPaNKdjYgLdzc",
-      "https://try-rpc.mainnet.solana.blockdaemon.tech"
-    ],
     "WebSockets": [],
     "ChainServer": "",
     "BatchSize": 10000,

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentio/runtime",
   "license": "Apache-2.0",
-  "version": "1.0.0-development",
+  "version": "2.0.0-development",
   "scripts": {
     "compile": "tsc -p .",
     "build": "yarn compile",
@@ -11,11 +11,9 @@
     "run-benchmark": "ts-node --files src/decode-benchmark.ts"
   },
   "dependencies": {
-    "@sentio/protos": "^1.0.0-development",
-    "@ethersproject/providers": "~5.7.0",
+    "@sentio/protos": "^2.0.0-development",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
-    "ethers": "~5.7.1",
     "fs-extra": "^11.0.0",
     "google-protobuf": "^3.15.8",
     "nice-grpc": "^2.0.0",
@@ -29,7 +27,7 @@
     "@types/command-line-args": "^5.2.0",
     "@types/command-line-usage": "^5.0.2",
     "@types/expect": "^24.3.0",
-    "@types/fs-extra": "^9.0.13",
+    "@types/fs-extra": "^11.0.1",
     "@types/google-protobuf": "^3.15.6",
     "@types/node": "^18.0.4"
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ ignore: @@
       - .git
       - .idea
       - .github
+      - tsconfig.mjs.json
       - docs
       - node_modules
       - packages/cli/node_modules
@@ Expand Down @@