Remove ethers

safe-global · Aug 31, 2023 · 2c04c3f · 2c04c3f
1 parent 9c85909
commit 2c04c3f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/packages/onramp-kit/package.json b/packages/onramp-kit/package.json
@@ -35,13 +35,16 @@
     "access": "public"
   },
   "dependencies": {
+    "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/address": "^5.7.0",
+    "@ethersproject/bytes": "^5.7.0",
+    "@ethersproject/hash": "^5.7.0",
     "@monerium/sdk": "^2.3.0",
     "@safe-global/api-kit": "^1.3.0",
     "@safe-global/protocol-kit": "^1.2.0",
     "@safe-global/safe-core-sdk-types": "^2.2.0",
     "@stripe/crypto": "^0.0.4",
-    "@stripe/stripe-js": "^1.52.0",
-    "ethers": "^5.7.0"
+    "@stripe/stripe-js": "^1.52.0"
   },
   "devDependencies": {
     "events": "^3.3.0",

diff --git a/packages/onramp-kit/src/packs/monerium/SafeMoneriumClient.test.ts b/packages/onramp-kit/src/packs/monerium/SafeMoneriumClient.test.ts
@@ -1,4 +1,4 @@
-import { ethers } from 'ethers'
+import { hashMessage } from '@ethersproject/hash'
 import { Currency, PaymentStandard } from '@monerium/sdk'
 import Safe, * as protocolKit from '@safe-global/protocol-kit'
 import { OperationType } from '@safe-global/safe-core-sdk-types'
@@ -111,7 +111,7 @@ describe('SafeMoneriumClient', () => {
           // @ts-expect-error - dataDecoded should have the method property
           dataDecoded: {
             method: 'signMessage',
-            parameters: [{ value: ethers.utils.hashMessage('message to sign') }]
+            parameters: [{ value: hashMessage('message to sign') }]
           }
         }
       ]

diff --git a/packages/onramp-kit/src/packs/monerium/SafeMoneriumClient.ts b/packages/onramp-kit/src/packs/monerium/SafeMoneriumClient.ts
@@ -1,4 +1,5 @@
-import { ethers } from 'ethers'
+import { hashMessage } from '@ethersproject/hash'
+import { arrayify } from '@ethersproject/bytes'
 import { Chain, IBAN, MoneriumClient, Networks, NewOrder, OrderKind } from '@monerium/sdk'
 import Safe, { getSignMessageLibContract } from '@safe-global/protocol-kit'
 import SafeApiKit from '@safe-global/api-kit'
@@ -68,7 +69,7 @@ export class SafeMoneriumClient extends MoneriumClient {
    * @returns A boolean indicating if the message is signed
    */
   async isMessageSigned(safeAddress: string, message: string): Promise<boolean> {
-    const messageHash = ethers.utils.hashMessage(message)
+    const messageHash = hashMessage(message)
     const messageHashSigned = await this.#isValidSignature(safeAddress, messageHash)
     return messageHashSigned
   }
@@ -92,7 +93,7 @@ export class SafeMoneriumClient extends MoneriumClient {
         // @ts-expect-error - dataDecoded should have the method property
         tx?.dataDecoded?.method === 'signMessage' &&
         // @ts-expect-error - dataDecoded should have the parameters array
-        tx?.dataDecoded?.parameters[0]?.value === ethers.utils.hashMessage(message)
+        tx?.dataDecoded?.parameters[0]?.value === hashMessage(message)
       )
     })
   }
@@ -114,7 +115,7 @@ export class SafeMoneriumClient extends MoneriumClient {
         safeVersion
       })
 
-      const txData = signMessageContract.encode('signMessage', [ethers.utils.hashMessage(message)])
+      const txData = signMessageContract.encode('signMessage', [hashMessage(message)])
 
       const safeTransaction = await this.#safeSdk.createTransaction({
         safeTransactionData: {
@@ -228,7 +229,7 @@ export class SafeMoneriumClient extends MoneriumClient {
         messageHash,
         '0x'
       ])
-      const msgBytes = ethers.utils.arrayify(messageHash)
+      const msgBytes = arrayify(messageHash)
 
       const eip1271BytesData = EIP_1271_BYTES_INTERFACE.encodeFunctionData('isValidSignature', [
         msgBytes,

diff --git a/packages/onramp-kit/src/packs/monerium/signatures.ts b/packages/onramp-kit/src/packs/monerium/signatures.ts
@@ -1,18 +1,19 @@
-import { ethers } from 'ethers'
+import { Interface } from '@ethersproject/abi'
 
 // EIP-1271 magic values (https://eips.ethereum.org/EIPS/eip-1271)
 // The four-byte code is defined as follows:
 // - 0x00000000 if the signature is invalid.
 // - 0x20c13b0b if the signature is valid and was produced using the eth_sign method.
 // - 0x1626ba7e if the signature is valid and was produced using the personal_sign method.
+
 // More info: https://docs.safe.global/safe-core-protocol/signatures/eip-1271
 const MAGIC_VALUE = '0x1626ba7e'
 const MAGIC_VALUE_BYTES = '0x20c13b0b'
 
-const EIP_1271_INTERFACE = new ethers.utils.Interface([
+const EIP_1271_INTERFACE = new Interface([
   'function isValidSignature(bytes32 _dataHash, bytes calldata _signature) external view'
 ])
-const EIP_1271_BYTES_INTERFACE = new ethers.utils.Interface([
+const EIP_1271_BYTES_INTERFACE = new Interface([
   'function isValidSignature(bytes calldata _data, bytes calldata _signature) public view'
 ])
 

diff --git a/yarn.lock b/yarn.lock
@@ -7049,7 +7049,7 @@ ethereumjs-wallet@^1.0.1:
     utf8 "^3.0.0"
     uuid "^8.3.2"
 
-ethers@5.7.2, ethers@^5.5.3, ethers@^5.5.4, ethers@^5.7.0, ethers@^5.7.1, ethers@^5.7.2:
+ethers@5.7.2, ethers@^5.5.3, ethers@^5.5.4, ethers@^5.7.1, ethers@^5.7.2:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
   integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==