Terra ledger support for airdrops

contracts/cw20/merkleAirdrop/contract.ts

@@ -41,7 +41,7 @@ interface SignedClaimMsg {
 }
 
 export interface SignedMessage {
-  claim_msg: SignedClaimMsg
+  claim_msg: string
   signature: string
 }
 

package.json

@@ -14,18 +14,22 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3",
     "@cosmjs/cosmwasm-stargate": "^0",
+    "@cosmjs/crypto": "^0.28.11",
     "@cosmjs/encoding": "^0",
+    "@cosmjs/ledger-amino": "^0.28.11",
     "@cosmjs/math": "^0",
     "@cosmjs/proto-signing": "^0",
     "@cosmjs/stargate": "^0",
     "@fontsource/jetbrains-mono": "^4",
     "@fontsource/roboto": "^4",
     "@headlessui/react": "^1",
     "@keplr-wallet/cosmos": "^0.9.16",
+    "@ledgerhq/hw-transport-webusb": "^6.27.2",
     "@popperjs/core": "^2",
     "@svgr/webpack": "^6",
     "@tailwindcss/forms": "^0",
     "@tailwindcss/line-clamp": "^0",
+    "@terra-money/ledger-terra-js": "^1.2.2",
     "@terra-money/terra.js": "^3.1.3",
     "@terra-money/wallet-provider": "^3.9.4",
     "axios": "^0",
@@ -81,4 +85,4 @@
   },
   "prettier": "@juno-tools/prettier-config",
   "private": true
-}
+}

pages/airdrops/[address]/claim.tsx

@@ -1,4 +1,7 @@
-import type { SignBytesResult } from '@terra-money/wallet-provider'
+import type { CreateTxOptions, Msg, SignDoc } from '@terra-money/terra.js'
+import { LCDClient, MsgSend } from '@terra-money/terra.js'
+import { prepareSignBytes } from '@terra-money/terra.js/dist/util/json'
+import type { SignResult } from '@terra-money/wallet-provider'
 import {
   ConnectType,
   useConnectedWallet,
@@ -42,6 +45,7 @@ const ClaimAirdropPage: NextPage = () => {
   // TODO: See if we can move these logic to a service
   const connectedWallet = useConnectedWallet()
   const [signature, setSignature] = useState('')
+  const [claimMsg, setClaimMsg] = useState('')
 
   const [amount, setAmount] = useState('')
   const [loading, setLoading] = useState(false)
@@ -90,30 +94,56 @@ const ClaimAirdropPage: NextPage = () => {
   }, [wallets[0]?.terraAddress])
 
   useEffect(() => {
-    setSignedMessage({ claim_msg: { addr: wallet.address }, signature })
-  }, [signature])
+    setSignedMessage({ claim_msg: claimMsg, signature })
+  }, [signature, claimMsg])
 
   // TODO: Think about moving this to a service
-  const signTerraClaimSignature = async (): Promise<string> => {
+  const signTerraClaimSignature = async (): Promise<Record<string, string>> => {
     return new Promise((resolve, reject) => {
       if (!connectedWallet) {
         toast.error('Terra Station Wallet not connected!')
         return
       }
 
-      const junoAddressMsgByteArray = Buffer.from(JSON.stringify({ addr: wallet.address }))
+      const bankMsg = new MsgSend(connectedWallet.walletAddress, connectedWallet.walletAddress, {
+        uluna: 1,
+      })
+      const tx: CreateTxOptions = {
+        msgs: [bankMsg],
+        memo: wallet.address,
+      }
 
       connectedWallet
-        .signBytes(junoAddressMsgByteArray)
-        .then((nextSignBytesResult: SignBytesResult) => {
-          const signedJunoAddress = Buffer.from(nextSignBytesResult.result.signature).toString('base64')
-          const publickey = nextSignBytesResult.result.public_key?.toAmino().value
-
-          const sig = Buffer.from(JSON.stringify({ pub_key: publickey, signature: signedJunoAddress })).toString(
-            'base64',
-          )
-          setSignature(sig)
-          resolve(sig)
+        .sign(tx)
+        .then((signResult: SignResult) => {
+          const lcdClient = new LCDClient({
+            URL: connectedWallet.network.lcd,
+            chainID: connectedWallet.network.chainID,
+          })
+
+          lcdClient.auth
+            .accountInfo(connectedWallet.walletAddress)
+            .then((terraAccountInfo) => {
+              const signDoc: SignDoc.Amino = {
+                account_number: terraAccountInfo.getAccountNumber().toString(),
+                chain_id: connectedWallet.network.chainID,
+                fee: signResult.result.auth_info.fee.toAmino(),
+                memo: signResult.memo as string,
+                msgs: signResult.msgs.map((message) => message.toAmino()) as Msg.Amino[],
+                sequence: terraAccountInfo.getSequenceNumber().toString(),
+              }
+
+              const claim = Buffer.from(JSON.stringify(prepareSignBytes(signDoc))).toString('base64')
+              const publickey = signResult.result.auth_info.signer_infos[0].public_key.toAmino().value
+              const sig = Buffer.from(
+                JSON.stringify({ pub_key: publickey, signature: signResult.result.signatures[0] }),
+              ).toString('base64')
+
+              setClaimMsg(claim)
+              setSignature(sig)
+              resolve({ sig, claimMsg: claim })
+            })
+            .catch(reject)
         })
         .catch(reject)
     })
@@ -146,7 +176,7 @@ const ClaimAirdropPage: NextPage = () => {
           setIsTerraAirdrop(airdrop.isTerraAirdrop)
 
           if (airdrop.isTerraAirdrop) {
-            setSignedMessage({ claim_msg: { addr: wallet.address }, signature })
+            setSignedMessage({ claim_msg: '', signature })
           }
 
           if (isClaimed) setAirdropState('claimed')
@@ -212,10 +242,10 @@ const ClaimAirdropPage: NextPage = () => {
 
       let signedMsg
       if (isTerraAirdrop) {
-        const sig = await signTerraClaimSignature()
+        const data = await signTerraClaimSignature()
         signedMsg = {
-          claim_msg: { addr: wallet.address },
-          signature: sig,
+          claim_msg: data.claimMsg,
+          signature: data.sig,
         }
         setSignedMessage(signedMessage)
       }
@@ -318,6 +348,14 @@ const ClaimAirdropPage: NextPage = () => {
         <JsonPreview content={transactionMessage} copyable isVisible={false} title="Show Transaction Message" />
       </Conditional>
 
+      <Conditional test={isTerraAirdrop}>
+        <Alert type="warning">
+          A send message of 0,000001 LUNA will be signed for making sure the terra wallet signature is valid on the
+          airdrop contract.
+          <br /> This message will not be broadcast to the network.
+        </Alert>
+      </Conditional>
+
       <Conditional test={wallet.initialized && (isTerraAirdrop || airdropState !== 'no_allocation')}>
         <div className="flex justify-end pb-6 space-x-4">
           <Conditional test={Boolean(cw20TokenAddress)}>