From 3dbbe43cb93b89d5c23c2df821d5694fc6ceca41 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Tue, 24 Sep 2024 14:59:03 -0400 Subject: [PATCH 1/2] fix(sui): use new sui gateway send message for call contract --- sui/gateway.js | 13 ++++++++----- sui/utils/sign-utils.js | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sui/gateway.js b/sui/gateway.js index 0313c81b..6167a655 100644 --- a/sui/gateway.js +++ b/sui/gateway.js @@ -116,14 +116,19 @@ async function callContract(keypair, client, config, chain, contractConfig, args }); } - tx.moveCall({ - target: `${packageId}::gateway::call_contract`, + const messageTicket = tx.moveCall({ + target: `${packageId}::gateway::prepare_message`, arguments: [ channel, tx.pure(bcs.string().serialize(destinationChain).toBytes()), tx.pure(bcs.string().serialize(destinationAddress).toBytes()), tx.pure(bcs.vector(bcs.u8()).serialize(arrayify(payload)).toBytes()), ], + }); + + tx.moveCall({ + target: `${packageId}::gateway::send_message`, + arguments: [messageTicket], }); if (!options.channel) { @@ -133,9 +138,7 @@ async function callContract(keypair, client, config, chain, contractConfig, args }); } - await broadcast(client, keypair, tx); - - printInfo('Contract called'); + await broadcast(client, keypair, tx, 'Message sent'); } async function approveMessages(keypair, client, config, chain, contractConfig, args, options) { diff --git a/sui/utils/sign-utils.js b/sui/utils/sign-utils.js index af04024a..fb9ce366 100644 --- a/sui/utils/sign-utils.js +++ b/sui/utils/sign-utils.js @@ -110,9 +110,7 @@ async function broadcast(client, keypair, tx, actionName) { }, }); - if (actionName) { - printInfo(actionName, receipt.digest); - } + printInfo(actionName || 'Tx', receipt.digest); return receipt; } From 270a5e3fa79053f6b4087fa1dc9258316bf156e0 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Tue, 24 Sep 2024 15:01:47 -0400 Subject: [PATCH 2/2] prettier --- sui/gateway.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sui/gateway.js b/sui/gateway.js index 6167a655..573b4a2a 100644 --- a/sui/gateway.js +++ b/sui/gateway.js @@ -124,7 +124,7 @@ async function callContract(keypair, client, config, chain, contractConfig, args tx.pure(bcs.string().serialize(destinationAddress).toBytes()), tx.pure(bcs.vector(bcs.u8()).serialize(arrayify(payload)).toBytes()), ], - }); + }); tx.moveCall({ target: `${packageId}::gateway::send_message`,