Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions backend/src/services/sorobanService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ function decodeAddress(val: xdr.ScVal): string {
if (addr.switch().value === xdr.ScAddressType.scAddressTypeAccount().value) {
return StrKey.encodeEd25519PublicKey(addr.accountId().ed25519());
}
return StrKey.encodeContract(Buffer.from(addr.contractId() as any));
const hash = addr.contractId();
return StrKey.encodeContract(Buffer.from(hash as Uint8Array));
}

function decodeMap(val: xdr.ScVal): Record<string, xdr.ScVal> {
Expand All @@ -49,8 +50,6 @@ async function simulateContractCall(method: string, args: xdr.ScVal[]): Promise<

const op = contract.call(method, ...args);

const { TransactionBuilder, Account, Networks } = await import('@stellar/stellar-sdk');

const tx = new TransactionBuilder(
new Account(
'GAAZI4TCR3TY5OJHCTJC2A4QSY6CJWJH5IAJTGKIN2ER7LBNVKOCCWN',
Expand Down Expand Up @@ -203,9 +202,9 @@ export async function pauseStream(

try {
const { Address } = await import('@stellar/stellar-sdk');

const senderAddr = new Address(senderAddress);

const retval = await simulateContractCall('pause_stream', [
senderAddr.toScVal(),
nativeToScVal(streamId, { type: 'u64' }),
Expand Down Expand Up @@ -237,9 +236,9 @@ export async function resumeStream(

try {
const { Address } = await import('@stellar/stellar-sdk');

const senderAddr = new Address(senderAddress);

const retval = await simulateContractCall('resume_stream', [
senderAddr.toScVal(),
nativeToScVal(streamId, { type: 'u64' }),
Expand Down
11 changes: 6 additions & 5 deletions backend/src/workers/soroban-event-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ export function decodeAddress(val: xdr.ScVal): string {
) {
return StrKey.encodeEd25519PublicKey(addr.accountId().ed25519());
}
// addr.contractId() returns a Hash (Opaque[]), convert to Buffer for encodeContract
return StrKey.encodeContract(Buffer.from(addr.contractId() as any));
// addr.contractId() returns a Hash (Opaque[]); cast to Uint8Array for encodeContract
const hash = addr.contractId();
return StrKey.encodeContract(Buffer.from(hash as Uint8Array));
}

/**
Expand Down Expand Up @@ -555,14 +556,14 @@ export class SorobanEventWorker {
where: { streamId },
select: { ratePerSecond: true, startTime: true, totalPausedDuration: true }
});

const ratePerSecondBigInt = BigInt(stream.ratePerSecond);
const newEndTime =
ratePerSecondBigInt === 0n
? null
: stream.startTime +
Number(BigInt(newDepositedAmount) / ratePerSecondBigInt) +
stream.totalPausedDuration;
Number(BigInt(newDepositedAmount) / ratePerSecondBigInt) +
stream.totalPausedDuration;

await tx.stream.update({
where: { streamId },
Expand Down
Loading