refactor: migrate wallet wasm into sdk

SiaFoundation · Mar 19, 2024 · e4d5595 · e4d5595
1 parent 5441e7d
commit e4d5595
Show file tree

Hide file tree

Showing 19 changed files with 426 additions and 435 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -24,7 +24,7 @@ runs:
         registry-url: https://registry.npmjs.org
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20'
+        go-version: '1.21.7'
     - uses: acifani/setup-tinygo@v2
       with:
         tinygo-version: '0.30.0'

diff --git a/apps/walletd/hooks/useSyncStatus.ts b/apps/walletd/hooks/useSyncStatus.ts
@@ -1,7 +1,7 @@
 import { hoursInMilliseconds } from '@siafoundation/design-system'
 import { useAppSettings } from '@siafoundation/react-core'
+import { ConsensusState } from '@siafoundation/types'
 import {
-  ConsensusState,
   useConsensusTip,
   useConsensusTipState,
   useEstimatedNetworkBlockHeight,

diff --git a/apps/walletd/lib/signSeed.ts b/apps/walletd/lib/signSeed.ts
@@ -1,8 +1,9 @@
-import { ConsensusState, ConsensusNetwork } from '@siafoundation/react-walletd'
 import {
   SiacoinElement,
   Transaction,
   SiafundElement,
+  ConsensusState,
+  ConsensusNetwork,
 } from '@siafoundation/types'
 import { getWalletWasm } from './wasm'
 import { AddressData } from '../contexts/addresses/types'

diff --git a/go.work b/go.work
@@ -1,9 +1,9 @@
-go 1.20
+go 1.21.7
 
 use (
 	./
 	./hostd
 	./renterd
-	./walletd
 	./sdk
+	./walletd
 )
diff --git a/go.work.sum b/go.work.sum
@@ -1 +1,7 @@
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
 go.sia.tech/mux v1.2.0/go.mod h1:Yyo6wZelOYTyvrHmJZ6aQfRoer3o4xyKQ4NmQLJrBSo=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/libs/react-walletd/src/siaTypes.ts b/libs/react-walletd/src/siaTypes.ts
@@ -9,63 +9,6 @@ import {
   FileContractElement,
 } from '@siafoundation/types'
 
-export type ConsensusNetwork = {
-  name: 'mainnet' | 'zen'
-  initialCoinbase: Currency
-  minimumCoinbase: Currency
-  initialTarget: string
-  hardforkDevAddr: {
-    height: number
-    oldAddress: string
-    newAddress: string
-  }
-  hardforkTax: {
-    height: number
-  }
-  hardforkStorageProof: {
-    height: number
-  }
-  hardforkOak: {
-    height: number
-    fixHeight: number
-    genesisTimestamp: string
-  }
-  hardforkASIC: {
-    height: number
-    oakTime: number
-    oakTarget: string
-  }
-  hardforkFoundation: {
-    height: number
-    primaryAddress: string
-    failsafeAddress: string
-  }
-  hardforkV2: {
-    allowHeight: number
-    requireHeight: number
-  }
-}
-
-export type ConsensusState = {
-  index: ChainIndex
-  prevTimestamps: string[]
-  depth: string
-  childTarget: string
-  siafundPool: string
-  oakTime: number
-  oakTarget: string
-  foundationPrimaryAddress: string
-  foundationFailsafeAddress: string
-  totalWork: string
-  difficulty: string
-  oakWork: string
-  elements: {
-    numLeaves: number
-    trees: string[]
-  }
-  attestations: number
-}
-
 export type GatewayPeer = {
   addr: string
   inbound: boolean

diff --git a/libs/sdk/package.json b/libs/sdk/package.json
@@ -3,7 +3,6 @@
   "description": "SDK for interacting directly with the Sia network from browsers and web clients.",
   "version": "0.0.2",
   "license": "MIT",
-  "dependencies": {},
   "devDependencies": {
     "undici": "5.28.3"
   },

diff --git a/libs/sdk/src/rhp.spec.ts b/libs/sdk/src/rhp.spec.ts
@@ -0,0 +1,263 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import {
+  HostPrices,
+  HostSettings,
+  RPCReadSectorRequest,
+  RPCReadSectorResponse,
+  RPCSettingsResponse,
+  RPCWriteSectorRequest,
+  RPCWriteSectorResponse,
+} from './types'
+import { initSDKTest } from './initTest'
+
+describe('rhp', () => {
+  describe('generateAccount', () => {
+    it('works', async () => {
+      const sdk = await initSDKTest()
+      const { privateKey, account, error } = sdk.rhp.generateAccount()
+      expect(error).toBeUndefined()
+      expect(privateKey).toBeDefined()
+      expect(privateKey?.length).toBeGreaterThan(40)
+      expect(account).toBeDefined()
+      expect(account?.length).toBeGreaterThan(40)
+    })
+  })
+  describe('settings', () => {
+    describe('request', () => {
+      it('valid', async () => {
+        const sdk = await initSDKTest()
+        const encode = sdk.rhp.encodeSettingsRequest()
+        expect(encode.rpc).toBeDefined()
+        expect(encode.error).not.toBeDefined()
+        const decode = sdk.rhp.decodeSettingsRequest(encode.rpc!)
+        expect(decode.data).toEqual({})
+        expect(decode.error).toBeUndefined()
+      })
+    })
+    describe('response', () => {
+      it('valid', async () => {
+        const sdk = await initSDKTest()
+        const json = getSampleRPCSettingsResponse()
+        const encode = sdk.rhp.encodeSettingsResponse(json)
+        expect(encode.rpc).toBeDefined()
+        expect(encode.rpc?.length).toEqual(323)
+        expect(encode.error).toBeUndefined()
+        const decode = sdk.rhp.decodeSettingsResponse(encode.rpc!)
+        expect(decode.data).toEqual(json)
+        expect(decode.error).toBeUndefined()
+      })
+      it('encode error', async () => {
+        const sdk = await initSDKTest()
+        const json = {
+          settings: {
+            walletAddress: 'invalid',
+          },
+        } as RPCSettingsResponse
+        const encode = sdk.rhp.encodeSettingsResponse(json)
+        expect(encode.rpc).toBeUndefined()
+        expect(encode.error).toEqual(
+          "decoding addr:<hex> failed: encoding/hex: invalid byte: U+0069 'i'"
+        )
+      })
+      it('decode error', async () => {
+        const sdk = await initSDKTest()
+        const json = getSampleRPCSettingsResponse()
+        const encode = sdk.rhp.encodeSettingsResponse(json)
+        // manipulate the valid rpc to make it invalid
+        encode.rpc!.set([1, 1], 30)
+        const decode = sdk.rhp.decodeSettingsResponse(encode.rpc!)
+        expect(decode.data).not.toEqual(json)
+        expect(decode.error).toEqual(
+          'encoded object contains invalid length prefix (65806 elems > 11227 bytes left in stream)'
+        )
+      })
+    })
+  })
+  describe('read', () => {
+    describe('request', () => {
+      it('valid', async () => {
+        const sdk = await initSDKTest()
+        const json: RPCReadSectorRequest = {
+          token: {
+            account:
+              'acct:1b6793e900df020dc9a43c6df5f5d10dc5793956d44831ca5bbfec659021b75e',
+            validUntil: '2022-12-31T00:00:00Z',
+            signature:
+              'sig:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072cfddf242a1ef033dd7d669c711e846c59cb916f804a03d72d279ffef7e6583404',
+          },
+          root: 'h:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072c',
+          prices: getSampleHostPrices(),
+          offset: 0,
+          length: 4,
+        }
+        const encode = sdk.rhp.encodeReadSectorRequest(json)
+        expect(encode.rpc?.length).toEqual(312)
+        expect(encode.error).toBeUndefined()
+        const decode = sdk.rhp.decodeReadSectorRequest(encode.rpc!)
+        expect(decode.data).toEqual(json)
+        expect(decode.error).toBeUndefined()
+      })
+      it('encode error', async () => {
+        const sdk = await initSDKTest()
+        const json: RPCReadSectorRequest = {
+          token: {
+            account: 'invalid',
+            validUntil: '2022-12-31T00:00:00Z',
+            signature:
+              'sig:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072cfddf242a1ef033dd7d669c711e846c59cb916f804a03d72d279ffef7e6583404',
+          },
+          root: 'h:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072c',
+          prices: getSampleHostPrices(),
+          offset: 0,
+          length: 4,
+        }
+        const encode = sdk.rhp.encodeReadSectorRequest(json)
+        expect(encode.rpc).toBeUndefined()
+        expect(encode.error).toEqual(
+          "decoding acct:<hex> failed: encoding/hex: invalid byte: U+0069 'i'"
+        )
+      })
+    })
+    describe('response', () => {
+      it('valid', async () => {
+        const sdk = await initSDKTest()
+        const json: RPCReadSectorResponse = {
+          proof: [
+            'h:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072c',
+          ],
+          sector: 'AQID',
+        }
+        const encode = sdk.rhp.encodeReadSectorResponse(json)
+        expect(encode.rpc?.toString()).toEqual(
+          [
+            0, 1, 0, 0, 0, 0, 0, 0, 0, 69, 114, 86, 214, 161, 96, 59, 239, 127,
+            169, 87, 167, 11, 91, 169, 106, 157, 239, 47, 234, 139, 76, 20, 131,
+            6, 13, 123, 165, 207, 138, 7, 44, 3, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3,
+          ].toString()
+        )
+        expect(encode.error).toBeUndefined()
+        const decode = sdk.rhp.decodeReadSectorResponse(encode.rpc!)
+        expect(decode.data).toEqual(json)
+        expect(decode.error).toBeUndefined()
+      })
+      it('encode error', async () => {
+        const sdk = await initSDKTest()
+        const json: RPCReadSectorResponse = {
+          proof: ['invalid'],
+          sector: 'AQID',
+        }
+        const encode = sdk.rhp.encodeReadSectorResponse(json)
+        expect(encode.rpc).toBeUndefined()
+        expect(encode.error).toEqual('decoding h:<hex> failed: unexpected EOF')
+      })
+    })
+  })
+  describe('write', () => {
+    describe('request', () => {
+      it('valid', async () => {
+        const sdk = await initSDKTest()
+        const json: RPCWriteSectorRequest = {
+          token: {
+            account:
+              'acct:1b6793e900df020dc9a43c6df5f5d10dc5793956d44831ca5bbfec659021b75e',
+            validUntil: '2022-12-31T00:00:00Z',
+            signature:
+              'sig:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072cfddf242a1ef033dd7d669c711e846c59cb916f804a03d72d279ffef7e6583404',
+          },
+          sector: 'AQID',
+          prices: getSampleHostPrices(),
+        }
+        const encode = sdk.rhp.encodeWriteSectorRequest(json)
+        expect(encode.rpc?.length).toEqual(275)
+        expect(encode.error).toBeUndefined()
+        const decode = sdk.rhp.decodeWriteSectorRequest(encode.rpc!)
+        expect(decode.data).toEqual(json)
+        expect(decode.error).toBeUndefined()
+      })
+      it('encode error', async () => {
+        const sdk = await initSDKTest()
+        const json = {
+          token: {
+            account: 'invalid',
+            validUntil: '2022-12-31T00:00:00Z',
+            signature:
+              'sig:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072cfddf242a1ef033dd7d669c711e846c59cb916f804a03d72d279ffef7e6583404',
+          },
+          sector: 'AQID',
+          prices: getSampleHostPrices(),
+        } as RPCWriteSectorRequest
+        const encode = sdk.rhp.encodeWriteSectorRequest(json)
+        expect(encode.rpc).toBeUndefined()
+        expect(encode.error).toEqual(
+          "decoding acct:<hex> failed: encoding/hex: invalid byte: U+0069 'i'"
+        )
+      })
+    })
+    describe('response', () => {
+      it('valid', async () => {
+        const sdk = await initSDKTest()
+        const json: RPCWriteSectorResponse = {
+          root: 'h:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072c',
+        }
+        const encode = sdk.rhp.encodeWriteSectorResponse(json)
+        expect(encode.rpc?.toString()).toEqual(
+          [
+            0, 69, 114, 86, 214, 161, 96, 59, 239, 127, 169, 87, 167, 11, 91,
+            169, 106, 157, 239, 47, 234, 139, 76, 20, 131, 6, 13, 123, 165, 207,
+            138, 7, 44,
+          ].toString()
+        )
+        expect(encode.error).toBeUndefined()
+        const decode = sdk.rhp.decodeWriteSectorResponse(encode.rpc!)
+        expect(decode.data).toEqual(json)
+        expect(decode.error).toBeUndefined()
+      })
+      it('encode error', async () => {
+        const sdk = await initSDKTest()
+        const json = {
+          root: 'invalid',
+        } as RPCWriteSectorResponse
+        const encode = sdk.rhp.encodeWriteSectorResponse(json)
+        expect(encode.rpc).toBeUndefined()
+        expect(encode.error).toEqual('decoding h:<hex> failed: unexpected EOF')
+      })
+    })
+  })
+})
+
+function getSampleHostPrices(): HostPrices {
+  return {
+    contractPrice: '1000000000',
+    collateral: '2000000000',
+    storagePrice: '3000000000',
+    ingressPrice: '4000000000',
+    egressPrice: '5000000000',
+    tipHeight: 450_000,
+    validUntil: '2022-12-31T00:00:00Z',
+    signature:
+      'sig:457256d6a1603bef7fa957a70b5ba96a9def2fea8b4c1483060d7ba5cf8a072cfddf242a1ef033dd7d669c711e846c59cb916f804a03d72d279ffef7e6583404',
+  }
+}
+
+function getSampleRPCSettingsResponse(): RPCSettingsResponse {
+  const prices = getSampleHostPrices()
+  const settings: HostSettings = {
+    version: [1, 2, 3],
+    netAddresses: [
+      { protocol: 'protocol1', address: 'address1longer' },
+      { protocol: 'protocol2longer', address: 'address2' },
+    ],
+    // 32 bytes
+    walletAddress:
+      'addr:eec8160897cf7058332040675d120c008dc32d96925e9b32a812b646e31676d7d52c118cad2c',
+    acceptingContracts: true,
+    maxCollateral: '1000000000',
+    maxDuration: 100,
+    remainingStorage: 100,
+    totalStorage: 100,
+    prices,
+  }
+  return {
+    settings,
+  }
+}
diff --git a/libs/sdk/src/sdk.ts b/libs/sdk/src/sdk.ts
@@ -5,7 +5,7 @@ export function getSDK() {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const wasm = (global as any).sia as WASM
   return {
-    wasm,
+    rhp: wasm.rhp,
     WebTransportClient,
   }
 }