Merge pull request #52 from dotbitHQ/fix/update-dependencies

web3max · web-flow · commit 010d83040d54 · 2023-04-17T15:33:43.000+08:00
fix: update dependencies.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ package/
 lib/
 lib.esm/
 example/browser/dist/
-*.tgz
+*.tgz
+pnpm-lock.yaml
diff --git a/packages/plugin-register/package.json b/packages/plugin-register/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dotbit/plugin-register",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "lib/index.js",
   "module": "lib.esm/index.js",
   "types": "lib/index.d.ts",
@@ -18,8 +18,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@gnosis.pm/safe-core-sdk": "^2.1.0",
-    "@gnosis.pm/safe-ethers-lib": "^1.1.0",
+    "@safe-global/protocol-kit": "^0.1.1",
+    "@safe-global/safe-ethers-lib": "^1.9.2",
     "ethers": "^5.7.2"
   }
 }
diff --git a/packages/plugin-register/src/index.ts b/packages/plugin-register/src/index.ts
@@ -16,8 +16,9 @@ import {
   RenewRes,
   isSubAccount
 } from 'dotbit'
-import EthersAdapter from '@gnosis.pm/safe-ethers-lib'
-import GnosisSDK, { EthSignSignature } from '@gnosis.pm/safe-core-sdk'
+import EthersAdapter from '@safe-global/safe-ethers-lib'
+import Safe from '@safe-global/protocol-kit'
+import SafeSignature from '@safe-global/protocol-kit/dist/src/utils/signatures/SafeSignature'
 import EthNftGnosisAbi from './EthNftGnosisAbi.json'
 import EthNftAbi from './EthNftAbi.json'
 import { ethers } from 'ethers'
@@ -161,27 +162,27 @@ export class BitPluginRegister implements BitPluginBase {
       const gnosisContract = new ethers.Contract(CrossEthGnosisAddress, EthNftGnosisAbi, this.signer.signer)
       const nonce = (await gnosisContract.uuidNonces(accountIdHex(account))).toNumber()
 
-      const gnosisSdk = await GnosisSDK.create({
+      const safeSdk = await Safe.create({
         ethAdapter,
         safeAddress: CrossEthGnosisAddress
       })
 
-      const transaction = {
+      const safeTransactionData = {
         to: CrossEthContract,
         value: '0',
         nonce,
         data
       }
 
-      const tx = await gnosisSdk.createTransaction(transaction)
+      const safeTransaction = await safeSdk.createTransaction({ safeTransactionData })
 
       signatures.forEach((signature) => {
-        tx.addSignature(new EthSignSignature(signature.signer, signature.data))
+        safeTransaction.addSignature(new SafeSignature(signature.signer, signature.data))
       })
 
-      gnosisSdk.getOwnersWhoApprovedTx = () => Promise.resolve([]) // We ignore sdk's some internal logic for now.
+      safeSdk.getOwnersWhoApprovedTx = () => Promise.resolve([]) // We ignore sdk's some internal logic for now.
 
-      const { hash: txHash } = await gnosisSdk.executeTransaction(tx)
+      const { hash: txHash } = await safeSdk.executeTransaction(safeTransaction)
 
       await this.bitBuilder.crossChainReturnTrxHashToService({
         account,
diff --git a/packages/plugin-register/src/version.ts b/packages/plugin-register/src/version.ts
@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.0.2'
+export const version = '0.0.3'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dotbit/plugin-register",`
`3`		`- "version": "0.0.2",`
	`3`	`+ "version": "0.0.3",`
`4`	`4`	`"main": "lib/index.js",`
`5`	`5`	`"module": "lib.esm/index.js",`
`6`	`6`	`"types": "lib/index.d.ts",`
`@@ -18,8 +18,8 @@`
`18`	`18`	`},`
`19`	`19`	`"license": "MIT",`
`20`	`20`	`"dependencies": {`
`21`		`- "@gnosis.pm/safe-core-sdk": "^2.1.0",`
`22`		`- "@gnosis.pm/safe-ethers-lib": "^1.1.0",`
	`21`	`+ "@safe-global/protocol-kit": "^0.1.1",`
	`22`	`+ "@safe-global/safe-ethers-lib": "^1.9.2",`
`23`	`23`	`"ethers": "^5.7.2"`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`// Generated by genversion.`
`2`		`-export const version = '0.0.2'`
	`2`	`+export const version = '0.0.3'`