Upgrade aws sdk

package.json

@@ -34,11 +34,11 @@
     "ethers": "^5.5.4"
   },
   "devDependencies": {
+    "@aws-sdk/client-kms": "*",
     "@metamask/eth-sig-util": "^4.0.1",
     "@types/jest": "^28.1.0",
     "@typescript-eslint/eslint-plugin": "^4.27.0",
     "@typescript-eslint/parser": "^4.27.0",
-    "aws-sdk": "*",
     "eslint": "^7.29.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",

src/eth.ts

@@ -1,4 +1,3 @@
-import { KMS } from 'aws-sdk'
 import * as asn1 from 'asn1.js'
 import { BigNumber, utils } from 'ethers'
 
@@ -24,7 +23,10 @@ const getRS = async (signParams: SignParams) => {
     throw new Error('Signature is undefined.')
   }
 
-  const decoded = EcdsaSigAsnParse.decode(signature.Signature, 'der')
+  const decoded = EcdsaSigAsnParse.decode(
+    Buffer.from(signature.Signature),
+    'der'
+  )
 
   const r = BigNumber.from(`0x${decoded.r.toString('hex')}`)
   let s = BigNumber.from(`0x${decoded.s.toString('hex')}`)
@@ -68,10 +70,9 @@ const getRecoveryParam = (
   throw new Error('Failed to calculate recovery param')
 }
 
-export const getEthAddressFromPublicKey = (
-  publicKey: KMS.PublicKeyType
-): string => {
-  const res = EcdsaPubKey.decode(publicKey, 'der')
+export const getEthAddressFromPublicKey = (publicKey: Uint8Array): string => {
+  const res = EcdsaPubKey.decode(Buffer.from(publicKey))
+
   const pubKeyBuffer: Buffer = res.pubKey.data
 
   const address = utils.computeAddress(pubKeyBuffer)

src/kms.ts

@@ -5,29 +5,42 @@ import {
 } from './types'
 import { getEthAddressFromPublicKey } from './eth'
 import { utils } from 'ethers'
+import {
+  GetPublicKeyCommand,
+  GetPublicKeyCommandOutput,
+  SignCommand,
+  SignCommandOutput
+} from '@aws-sdk/client-kms'
 
-export const getPublicKey = (getPublicKeyParams: GetPublicKeyParams) => {
+export const getPublicKey = (
+  getPublicKeyParams: GetPublicKeyParams
+): Promise<GetPublicKeyCommandOutput> => {
   const { keyId, kmsInstance } = getPublicKeyParams
-  return kmsInstance.getPublicKey({ KeyId: keyId }).promise()
+  const command = new GetPublicKeyCommand({ KeyId: keyId })
+
+  return kmsInstance.send(command)
 }
 export const getEthAddressFromKMS = async (
   getEthAddressFromKMSparams: GetEthAddressFromKMSparams
-) => {
+): Promise<string> => {
   const { keyId, kmsInstance } = getEthAddressFromKMSparams
   const KMSKey = await getPublicKey({ keyId, kmsInstance })
 
   return getEthAddressFromPublicKey(KMSKey.PublicKey)
 }
 
-export const sign = (signParams: SignParams) => {
+export const sign = async (
+  signParams: SignParams
+): Promise<SignCommandOutput> => {
   const { keyId, message, kmsInstance } = signParams
   const formatted = Buffer.from(utils.arrayify(message))
-  return kmsInstance
-    .sign({
-      KeyId: keyId,
-      Message: formatted,
-      SigningAlgorithm: 'ECDSA_SHA_256',
-      MessageType: 'DIGEST'
-    })
-    .promise()
+
+  const command = new SignCommand({
+    KeyId: keyId,
+    Message: formatted,
+    SigningAlgorithm: 'ECDSA_SHA_256',
+    MessageType: 'DIGEST'
+  })
+
+  return kmsInstance.send(command)
 }

src/signer.ts

@@ -1,4 +1,4 @@
-import AWS from 'aws-sdk'
+import { KMSClient } from '@aws-sdk/client-kms'
 import { utils, Signer, providers, BigNumber } from 'ethers'
 import { keccak256 } from '@ethersproject/keccak256'
 import { _TypedDataEncoder } from '@ethersproject/hash'
@@ -18,11 +18,11 @@ export class KMSSigner extends Signer implements TypedDataSigner {
   constructor(
     public provider: providers.Provider,
     public keyId: string,
-    private kmsInstance?: AWS.KMS
+    private kmsInstance?: KMSClient
   ) {
     super()
     this.keyId = keyId
-    this.kmsInstance = kmsInstance ?? new AWS.KMS()
+    this.kmsInstance = kmsInstance ?? new KMSClient({})
   }
 
   async getAddress(): Promise<string> {

src/types.ts

@@ -1,19 +1,19 @@
-import { KMS } from 'aws-sdk'
+import { KMSClient, SignCommandInput } from '@aws-sdk/client-kms'
 
 export type SignParams = {
-  keyId: KMS.SignRequest['KeyId']
+  keyId: SignCommandInput['KeyId']
   message: string
-  kmsInstance: KMS
+  kmsInstance: KMSClient
 }
 
 export type GetEthAddressFromKMSparams = {
-  keyId: KMS.SignRequest['KeyId']
-  kmsInstance: KMS
+  keyId: SignCommandInput['KeyId']
+  kmsInstance: KMSClient
 }
 
 export type GetPublicKeyParams = {
-  keyId: KMS.SignRequest['KeyId']
-  kmsInstance: KMS
+  keyId: SignCommandInput['KeyId']
+  kmsInstance: KMSClient
 }
 
 export type CreateSignatureParams = SignParams & {

tests/signer.test.ts

@@ -1,4 +1,3 @@
-import AWS from 'aws-sdk'
 import { getEthAddressFromKMS, KMSSigner } from '../src'
 import { utils, providers, Wallet } from 'ethers'
 import {
@@ -12,28 +11,32 @@ import {
   recoverTypedSignature,
   SignTypedDataVersion
 } from '@metamask/eth-sig-util'
+import { CreateKeyCommand, KMSClient } from '@aws-sdk/client-kms'
 
 describe('KMSSinger', () => {
-  let kms: AWS.KMS
+  let kms: KMSClient
   let keyId: string
   let walletAddress: string
   let kmsSigner: KMSSigner
   const providerUrl = process.env.GANACHE_ENDPOINT
 
   const provider = new providers.JsonRpcProvider(providerUrl)
   beforeAll(async () => {
-    kms = new AWS.KMS({
+    kms = new KMSClient({
       endpoint: process.env.KMS_ENDPOINT,
       region: 'local',
-      accessKeyId: 'AKIAXTTRUF7NU7KDMIED',
-      secretAccessKey: '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'
+      credentials: {
+        accessKeyId: 'AKIAXTTRUF7NU7KDMIED',
+        secretAccessKey: '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'
+      }
+    })
+
+    const command = new CreateKeyCommand({
+      KeyUsage: 'SIGN_VERIFY',
+      CustomerMasterKeySpec: 'ECC_SECG_P256K1'
     })
-    const createResponse = await kms
-      .createKey({
-        KeyUsage: 'SIGN_VERIFY',
-        CustomerMasterKeySpec: 'ECC_SECG_P256K1'
-      })
-      .promise()
+
+    const createResponse = await kms.send(command)
 
     keyId = createResponse.KeyMetadata.KeyId
     walletAddress = await getEthAddressFromKMS({ kmsInstance: kms, keyId })