Skip to content

Commit

Permalink
Suppor deserialization of GameAccount using bcs and sui ts sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@Linerre
Linerre committed Jan 28, 2025
1 parent 3a60a1e commit 13f9532
Show file tree
Hide file tree
Showing 6 changed files with 162 additions and 109 deletions.
36 changes: 18 additions & 18 deletions js/sdk-sui/bin/cli.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ import { CloseGameAccountParams, CreateGameAccountParams, CreatePlayerProfilePar
import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
const wallet = new LocalSuiWallet('suiprivkey1qqds4vhlnm38pma946w5ke4g2846wpkgfygu88auscspswd5d4hl6fvc4q2');

const TEST_PACKAGE_ID = "0xa5698c13cdfc969501fc22982838d227cc83a79cf8810037d4b5e74451b569ea";
const TEST_GAME_ID = "0xe48c698837045e6296c7cd6d14d809f90192d38fb6651940d2adbaae2d700e1d";
const TEST_SERVER_TABLE_ID = "0xdac65117edba713a19b37dac5b7b0c6230eb2e16fc0e729d9fb6541282eca2b3";
const TEST_PROFILE_TABLE_ID = "0x4b4e744f568b7c904e4353f88f7c9a49a46f151493ff25878d9b0e66c2cd1ef3";
const TEST_RECIPIENT_ID = "0x3bd2cf3a28df3e80779b2e401af54ef24a405fdd7d67f7687145f597d18dbb03";
const TEST_PACKAGE_ID = "0x094ab410b77496fc9ddccc9f330e2495583df5e6ea59e4498fff5a6172eac462";
const TEST_CASH_GAME_ID = "0x5d5e5b48ba5decc365a46777ad20e4ed926e3b6fb38c5fd06729a999496c0c6a";
const TEST_TICKET_GAME_ID = "0xcfc82be4212e504a2bc8b9a6b5b66ed0db92be4e2ab0befe5ba7146a59f54665"
const TEST_RECIPIENT_ID = "0x8b8e76d661080e47d76248cc33b43324b4126a8532d7642ab6c47946857c1e1c";
const TEST_REGISTRY_ID = "0xcb430f98bd97f8c3697cbdbf0de6b9b59411b2634aeebd07f4434fec30f443c7";
const TEST_GAME_NFT = "0x5ebed419309e71c1cd28a3249bbf792d2f2cc8b94b0e21e45a9873642c0a5cdc";

function testCreatePlayerProfile() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
const params = {
nick: 'yuumi Game', // nick string
nick: 'Race Sui Tester', // nick string
pfp: undefined, // pfp address params
}

let response = new ResponseHandle<CreatePlayerProfileResponse, CreatePlayerProfileError>()
suiTransport.createPlayerProfile(wallet, params, response);
}

async function testGetPlayerProfile() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
let res = await suiTransport.getPlayerProfile('0x5b6eb18e764749862726832bf35e37d597975d234ef341fb39770a736879bc7b')
Expand Down Expand Up @@ -98,7 +98,6 @@ async function testListTokens() {
console.log('tokens', res)
}


async function testListTokensWithBalance() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
// const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
Expand All @@ -111,9 +110,10 @@ async function testListTokensWithBalance() {
let res = await suiTransport.listTokenBalance(walletAddr, tokenAddrs);
console.log('tokens', res)
}

async function testGetGameAccount() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
const objectId = '0x0cb1411ec1ed736640a53acf29b22559efd869429b82915123b600c741fe2add'
const objectId = TEST_CASH_GAME_ID;
let res = await suiTransport.getGameAccount(objectId);
console.log('testGetGameAccount', res)
}
Expand All @@ -125,12 +125,12 @@ async function testGetRegistration() {
console.log('testGetRegistration', res)
}

async function testGetRegistrationWithGames() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
const objectId = '0x65f80e8f4e82f4885c96ccba4da02668428662e975b0a6cd1fa08b61e4e3a2fc'
let res = await suiTransport.getRegistrationWithGames(objectId);
console.log('testGetRegistrationWithGames', res)
}
// async function testGetRegistrationWithGames() {
// const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
// const objectId = '0x65f80e8f4e82f4885c96ccba4da02668428662e975b0a6cd1fa08b61e4e3a2fc'
// let res = await suiTransport.getRegistrationWithGames(objectId);
// console.log('testGetRegistrationWithGames', res)
// }

async function testRegisterGame() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
Expand All @@ -146,7 +146,7 @@ async function testRegisterGame() {
async function testJoinGame() {
const suiTransport = new SuiTransport('https://fullnode.devnet.sui.io:443');
const params: JoinParams = {
gameAddr: TEST_GAME_ID,
gameAddr: TEST_CASH_GAME_ID,
amount: BigInt(100_000_000),
position: 3,
verifyKey: 'player3',
Expand Down Expand Up @@ -206,9 +206,9 @@ function main() {
case 'getRegistration':
testGetRegistration()
break
case 'getRegistrationWithGames':
testGetRegistrationWithGames()
break
// case 'getRegistrationWithGames':
// testGetRegistrationWithGames()
// break
case 'createGameAccount':
testCreateGameAccount()
break
Expand Down
2 changes: 1 addition & 1 deletion js/sdk-sui/src/constants.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const PROFILE_TABLE_ID = "0x4b4e744f568b7c904e4353f88f7c9a49a46f151493ff25878d9b0e66c2cd1ef3"
export const PACKAGE_ID = "0xefdf5f95dd6dc87307e10b18abcafb35e0fdc82077c76edec18469064e4a4e99"
export const PACKAGE_ID = "0x35032bdba017ce9b5f1c00b722bc58037343dc01de639d721c63538519497795"

export const PROFILE_STRUCT_TYPE = `${PACKAGE_ID}::profile::Profile`
export const GAME_OBJECT_TYPE = `${PACKAGE_ID}::game::Game`
Expand Down
99 changes: 52 additions & 47 deletions js/sdk-sui/src/sui-transport.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import {
import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519'
import { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions'
import { bcs, BcsType, fromBase64 } from '@mysten/bcs'
import { Parser, PlayerPorfileParser } from './types'
import { Parser, GameAccountParser, PlayerPorfileParser } from './types'
import { SuiWallet } from './sui-wallet'
import { LocalSuiWallet } from './local-wallet'
import {
Expand Down Expand Up @@ -481,56 +481,61 @@ export class SuiTransport implements ITransport {
}
async getGameAccount(addr: string): Promise<GameAccount | undefined> {
const suiClient = this.suiClient
const info: SuiObjectResponse = await suiClient.getObject({
const resp: SuiObjectResponse = await suiClient.getObject({
id: addr,
options: {
showContent: true,
showBcs: true,
showType: true,
// showContent: true,
},
})
const content = info.data?.content
if (!content || content.dataType !== 'moveObject') {
return undefined
}
if (!content.fields) return undefined
let fields: MoveStruct = content.fields
if (Array.isArray(fields)) {
return undefined
}
if ('fields' in fields) {
return undefined
}
return {
addr: addr,
title: fields?.title as string,
bundleAddr: fields.bundle_addr as string,
tokenAddr: fields.token_addr as string,
ownerAddr: fields.owner as string,
settleVersion: BigInt(fields.settle_version?.toString() || 0),
accessVersion: BigInt(fields.access_version?.toString() || 0),
players: fields.players as [],
deposits: fields.deposits as [],
servers: fields.servers as [],
transactorAddr: fields.transactor_addr as string | undefined,
votes: fields.votes as [],
unlockTime: BigInt(fields.unlock_time?.toString() || 0),
maxPlayers: Number(fields.max_players) || 0,
dataLen: Number(fields.data_len) || 0,
data: fields.data ? new Uint8Array(fields.data as number[]) : new Uint8Array(),
entryType: fields?.entry_type
? ((fields.entry_type as MoveVariant).variant as unknown as EntryType)
: ('None' as unknown as EntryType),
recipientAddr: fields.recipient_addr as string,
checkpointOnChain: fields.checkpoint as unknown as CheckpointOnChain | undefined,
entryLock: fields.entry_lock
? ((fields.entry_lock as MoveVariant).variant as 'Closed' | 'Open' | 'JoinOnly' | 'DepositOnly')
: 'Closed',
bonuses: (fields.bonuses as any[]).map(b => ({
identifier: b.identifier,
tokenAddr: b.tokenAddr,
amount: BigInt(b.amount),
})),
}

return parseObjectData(parseSingleObjectResponse(resp), GameAccountParser)

// const content = info.data?.content
// if (!content || content.dataType !== 'moveObject') {
// return undefined
// }
// if (!content.fields) return undefined
// let fields: MoveStruct = content.fields
// if (Array.isArray(fields)) {
// return undefined
// }
// if ('fields' in fields) {
// return undefined
// }
// return {
// addr: addr,
// title: fields?.title as string,
// bundleAddr: fields.bundle_addr as string,
// tokenAddr: fields.token_addr as string,
// ownerAddr: fields.owner as string,
// settleVersion: BigInt(fields.settle_version?.toString() || 0),
// accessVersion: BigInt(fields.access_version?.toString() || 0),
// players: fields.players as [],
// deposits: fields.deposits as [],
// servers: fields.servers as [],
// transactorAddr: fields.transactor_addr as string | undefined,
// votes: fields.votes as [],
// unlockTime: BigInt(fields.unlock_time?.toString() || 0),
// maxPlayers: Number(fields.max_players) || 0,
// dataLen: Number(fields.data_len) || 0,
// data: fields.data ? new Uint8Array(fields.data as number[]) : new Uint8Array(),
// entryType: fields?.entry_type
// ? ((fields.entry_type as MoveVariant).variant as unknown as EntryType)
// : ('None' as unknown as EntryType),
// recipientAddr: fields.recipient_addr as string,
// checkpointOnChain: fields.checkpoint as unknown as CheckpointOnChain | undefined,
// entryLock: fields.entry_lock
// ? ((fields.entry_lock as MoveVariant).variant as 'Closed' | 'Open' | 'JoinOnly' | 'DepositOnly')
// : 'Closed',
// bonuses: (fields.bonuses as any[]).map(b => ({
// identifier: b.identifier,
// tokenAddr: b.tokenAddr,
// amount: BigInt(b.amount),
// })),
// }

}

async listGameAccounts(addrs: string[]): Promise<GameAccount[]> {
Expand Down Expand Up @@ -777,7 +782,7 @@ function parseObjectData<T, S extends BcsType<S['$inferInput']>>(
}

if (data.dataType === 'package') {
console.error('Not a profile object')
console.error('Not a move object')
return undefined
}

Expand Down
2 changes: 1 addition & 1 deletion js/sdk-sui/src/types.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { Parser } from './types/parser'
export { PlayerPorfileParser } from './types/player-profile'
// export { GameAccountParser } from './types/game'
export { GameAccountParser } from './types/game'
// export { RecipientAccountParser } from './types/recipient'
// export { RegistrationAccountParser } from './types/registration'
// export { ServerParser } from './types/server'
Loading

0 comments on commit 13f9532

Please sign in to comment.