Update join

js/sdk-sui/src/constants.ts

@@ -1,4 +1,4 @@
-export const PACKAGE_ID = "0xd867e50728e319a23d2972895f50448b1386c8bd4e21c669236a5b37fc45c2c3"
+export const PACKAGE_ID = "0x598a36928abb11489a6091c01cf0cf2135aa8b076ed5e4bd3bfebd1f56395f96"
 export const PROFILE_STRUCT_TYPE = `${PACKAGE_ID}::profile::PlayerProfile`
 export const SERVER_STRUCT_TYPE = `${PACKAGE_ID}::server::Server`
 export const GAME_STRUCT_TYPE = `${PACKAGE_ID}::game::Game`

js/sdk-sui/src/sui-transport.ts

@@ -49,19 +49,15 @@ import {
     RecipientSlotShareInit,
 } from '@race-foundation/sdk-core'
 import { Chain } from './common'
-import {
-    ObjectOwner,
-    SuiClient,
-    SuiObjectResponse,
-} from '@mysten/sui/client'
+import { ObjectOwner, SuiClient, SuiObjectResponse } from '@mysten/sui/client'
 import { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions'
 import {
     GameAccountParser,
     GameBundleParser,
     PlayerPorfileParser,
     RegistrationAccountParser,
     RecipientAccountParser,
-    ServerParser
+    ServerParser,
 } from './types'
 import {
     CLOCK_ID,
@@ -72,7 +68,17 @@ import {
     SERVER_STRUCT_TYPE,
     SUI_ICON_URL,
 } from './constants'
-import { coerceWallet, getOwnedObjectRef, getSharedObjectRef, parseFirstObjectResponse, parseMultiObjectResponse, parseObjectData, parseSingleObjectResponse, resolveObjectCreatedByType, resolveObjectMutatedByType } from './misc'
+import {
+    coerceWallet,
+    getOwnedObjectRef,
+    getSharedObjectRef,
+    parseFirstObjectResponse,
+    parseMultiObjectResponse,
+    parseObjectData,
+    parseSingleObjectResponse,
+    resolveObjectCreatedByType,
+    resolveObjectMutatedByType,
+} from './misc'
 
 export class SuiTransport implements ITransport {
     suiClient: SuiClient
@@ -129,15 +135,11 @@ export class SuiTransport implements ITransport {
                 break
             case 'ticket':
                 entryFunction = 'create_ticket_entry'
-                entry_type_args = [
-                    transaction.pure.u64(params.entryType.amount),
-                ]
+                entry_type_args = [transaction.pure.u64(params.entryType.amount)]
                 break
             case 'gating':
                 entryFunction = 'create_gating_entry'
-                entry_type_args = [
-                    transaction.pure.string(params.entryType.collection),
-                ]
+                entry_type_args = [transaction.pure.string(params.entryType.collection)]
                 break
             default:
                 entryFunction = 'create_disabled_entry'
@@ -207,18 +209,14 @@ export class SuiTransport implements ITransport {
         } else {
             transaction.moveCall({
                 target: `${PACKAGE_ID}::profile::create_profile`,
-                arguments: [
-                    transaction.pure.string(params.nick),
-                    transaction.pure.option('address', params.pfp),
-                ],
+                arguments: [transaction.pure.string(params.nick), transaction.pure.option('address', params.pfp)],
             })
             const result = await wallet.send(transaction, suiClient, resp)
             if ('err' in result) {
                 return resp.transactionFailed(result.err)
             }
 
             objectChange = await resolveObjectCreatedByType(this.suiClient, result.ok, PROFILE_STRUCT_TYPE)
-
         }
 
         if (objectChange) {
@@ -232,7 +230,6 @@ export class SuiTransport implements ITransport {
     }
 
     async getPlayerProfile(addr: string): Promise<PlayerProfile | undefined> {
-
         const resp = await this.suiClient.getOwnedObjects({
             owner: addr,
             filter: {
@@ -288,8 +285,43 @@ export class SuiTransport implements ITransport {
 
         const transaction = new Transaction()
 
-        // split coin for buyin
-        const [coin] = transaction.splitCoins(transaction.gas, [transaction.pure.u64(params.amount)])
+        const coinsResp = await suiClient.getCoins({ owner: wallet.walletAddr, coinType: game.tokenAddr })
+
+        let coins = coinsResp.data
+
+        const gasCoin = coins[coins.length - 1]
+
+        transaction.setGasPayment([{ objectId: gasCoin.coinObjectId, ...gasCoin }])
+        transaction.setGasBudget(1000000000n)
+
+        console.log('coins:', coins)
+
+        let amountToPay = 0n
+        let coinsToPay = []
+
+        for (let i = 0; i < coins.length; i++) {
+            const coin = coins[i]
+            amountToPay += BigInt(coin.balance)
+            if (amountToPay > amount) {
+                const split = amount - amountToPay + BigInt(coin.balance)
+                const coinToSplit = i == coins.length - 1 ? transaction.gas : coin.coinObjectId
+                console.log('coin to split:', coinToSplit, ', split amount: ', split)
+                const [pay] = transaction.splitCoins(coinToSplit, [split])
+                coinsToPay.push(pay)
+                break
+            } else {
+                coinsToPay.push(coin.coinObjectId)
+            }
+        }
+
+        if (amountToPay < amount) {
+            return resp.failed('insufficient-funds')
+        }
+
+        const payment = transaction.makeMoveVec({ elements: coinsToPay })
+
+        console.log('payment:', payment)
+
         // join the game
         transaction.moveCall({
             target: `${PACKAGE_ID}::game::join_game`,
@@ -298,7 +330,7 @@ export class SuiTransport implements ITransport {
                 transaction.pure.u16(position),
                 transaction.pure.u64(amount),
                 transaction.pure.string(verifyKey),
-                coin,
+                payment,
             ],
             typeArguments: [game.tokenAddr],
         })
@@ -499,21 +531,21 @@ export class SuiTransport implements ITransport {
     }
 
     async getGameBundle(addr: string): Promise<GameBundle | undefined> {
-        const suiClient = this.suiClient;
+        const suiClient = this.suiClient
         const resp: SuiObjectResponse = await suiClient.getObject({
             id: addr,
             options: {
                 showBcs: true,
-                showType: true
-            }
+                showType: true,
+            },
         })
         return parseObjectData(parseSingleObjectResponse(resp), GameBundleParser)
     }
 
     async getServerAccount(addr: string): Promise<ServerAccount | undefined> {
         const resp = await this.suiClient.getOwnedObjects({
             owner: addr,
-            filter: { StructType: SERVER_STRUCT_TYPE},
+            filter: { StructType: SERVER_STRUCT_TYPE },
             options: { showBcs: true },
         })
         return parseObjectData(parseFirstObjectResponse(resp), ServerParser)
@@ -528,10 +560,7 @@ export class SuiTransport implements ITransport {
                 showType: true,
             },
         })
-        return parseObjectData(
-            parseSingleObjectResponse(resp),
-            RegistrationAccountParser
-        )
+        return parseObjectData(parseSingleObjectResponse(resp), RegistrationAccountParser)
     }
 
     async getRecipient(addr: string): Promise<RecipientAccount | undefined> {
@@ -543,10 +572,7 @@ export class SuiTransport implements ITransport {
                 showType: true,
             },
         })
-        return parseObjectData(
-            parseSingleObjectResponse(resp),
-            RecipientAccountParser
-        )
+        return parseObjectData(parseSingleObjectResponse(resp), RecipientAccountParser)
     }
 
     async getTokenDecimals(addr: string): Promise<number | undefined> {
@@ -614,10 +640,12 @@ export class SuiTransport implements ITransport {
     }
 
     async listTokenBalance(walletAddr: string, tokenAddrs: string[], storage?: IStorage): Promise<TokenBalance[]> {
-        return (await this.suiClient.getAllBalances({owner: walletAddr})).map(b => ({
-            addr: b.coinType,
-            amount: BigInt(b.totalBalance)
-        })).filter(t => tokenAddrs.includes(t.addr))
+        return (await this.suiClient.getAllBalances({ owner: walletAddr }))
+            .map(b => ({
+                addr: b.coinType,
+                amount: BigInt(b.totalBalance),
+            }))
+            .filter(t => tokenAddrs.includes(t.addr))
     }
 
     async listNfts(walletAddr: string): Promise<Nft[]> {

transport/src/sui.rs

@@ -65,7 +65,6 @@ mod constants;
 mod types;
 mod utils;
 mod nft;
-mod payment;
 pub use constants::*;
 pub use types::*;
 pub use utils::*;