Skip to content

Commit

Permalink
Update @tonconnect/ui & @ton-community/assets-sdk versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
barinbritva committed Jul 15, 2024
1 parent 54c0088 commit 4581326
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 81 deletions.
100 changes: 46 additions & 54 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/cocos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"build": "webpack --mode production"
},
"dependencies": {
"@tonconnect/ui": "^2.0.1-beta.0",
"@tonconnect/ui": "^2.0.6",
"@ton/ton": "^13.9.0",
"@orbs-network/ton-access": "^2.3.3",
"@ton-community/assets-sdk": "0.0.4-beta.1"
"@ton-community/assets-sdk": "~0.0.4"
},
"devDependencies": {
"webpack": "^5.92.0",
Expand Down
9 changes: 4 additions & 5 deletions packages/common/external.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import {ExtendedTonClient4} from '@ton-community/assets-sdk';
import {OpenedContract} from '@ton/ton';
import {JettonWallet} from '@ton-community/assets-sdk';

export {Cell, beginCell, Address, toNano, fromNano} from '@ton/core';
export {TonClient, TonClient4Parameters} from '@ton/ton';
export {TonClient, TonClient4, TonClient4Parameters} from '@ton/ton';
export {TonConnectUI} from '@tonconnect/ui';
export {getHttpV4Endpoint} from '@orbs-network/ton-access';
export {Sender, SenderArguments, SendMode, storeStateInit} from '@ton/core';
export {AssetsSDK, JettonTransferMessage, NftTransferMessage} from '@ton-community/assets-sdk';

class TonClient4 extends ExtendedTonClient4 {}

export {TonClient4};
export type JettonSendOptions = Parameters<OpenedContract<JettonWallet>['send']>[3];
43 changes: 25 additions & 18 deletions packages/common/game-fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
TonClient4Parameters,
Cell,
beginCell,
JettonTransferMessage
Sender,
JettonSendOptions
} from './external';
import {WalletConnector, WalletConnectorParams, Wallet, Account, WalletApp} from './interfaces';
import {TonConnectSender} from './ton-connect-sender';
Expand Down Expand Up @@ -95,11 +96,17 @@ export interface GameFiConstructorParams {
export abstract class GameFiBase {
public readonly walletConnector: WalletConnector;
public readonly assetsSdk: AssetsSDK;
public readonly sender: Sender;
public readonly merchant?: Merchant;

constructor(params: GameFiConstructorParams) {
if (params.assetsSdk.sender == null) {
throw new Error('Sender is not configured.');
}

this.walletConnector = params.walletConnector;
this.assetsSdk = params.assetsSdk;
this.sender = params.assetsSdk.sender;
if (params.merchant != null) {
this.merchant = params.merchant;
}
Expand Down Expand Up @@ -177,22 +184,27 @@ export abstract class GameFiBase {
const jetton = this.assetsSdk.openJetton(this.merchantJettonAddress);
const jettonWallet = await jetton.getWallet(this.walletAddress);

const message: JettonTransferMessage = {
amount: params.amount,
to: params.to,
responseDestination: this.walletAddress
const options: JettonSendOptions = {
returnExcess: {
address: this.walletAddress
}
};
if (params.customPayload != null) {
message.customPayload = this.createMessagePayload(params.customPayload);
options.customPayload = this.createMessagePayload(params.customPayload);
}
if (params.forwardAmount != null) {
message.forwardAmount = params.forwardAmount;
}
if (params.forwardPayload != null) {
message.forwardPayload = this.createMessagePayload(params.forwardPayload);
if (params.forwardAmount != null || params.forwardPayload != null) {
options.notify = {};

if (params.forwardAmount != null) {
options.notify.amount = params.forwardAmount;
}

if (params.forwardPayload != null) {
options.notify.payload = this.createMessagePayload(params.forwardPayload);
}
}

return jettonWallet.sendTransfer(message);
return jettonWallet.send(this.sender, params.to, params.amount, options);
}

/**
Expand Down Expand Up @@ -335,12 +347,7 @@ export abstract class GameFiBase {
const contentResolver = new ProxyContentResolver(contentResolverParams);

const assetsSdk = AssetsSDK.create({
api: {
openExtended: (contract) => {
return tonClient.openExtended(contract);
},
provider: (address, init) => tonClient.provider(address, init)
},
api: tonClient,
contentResolver: contentResolver,
sender: new TonConnectSender(walletConnector)
});
Expand Down
4 changes: 2 additions & 2 deletions packages/phaser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"build": "tsc"
},
"dependencies": {
"@tonconnect/ui": "^2.0.1-beta.0",
"@tonconnect/ui": "^2.0.6",
"@ton/ton": "^13.9.0",
"@orbs-network/ton-access": "^2.3.3",
"@ton-community/assets-sdk": "0.0.4-beta.1"
"@ton-community/assets-sdk": "~0.0.4"
},
"peerDependencies": {
"phaser": "^3.0.0"
Expand Down

0 comments on commit 4581326

Please sign in to comment.