Skip to content

test-rawTransaction #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bluezdot wants to merge 1 commit into
base: openbit-dev
Choose a base branch
from
Open

test-rawTransaction #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/extension-base/src/koni/background/handlers/Extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,7 +1940,8 @@ export default class KoniExtension {
network
});

console.log('getBitcoinTransactionObject', transaction);
console.log('[i] Bitcoin Transaction Object:', transaction);
console.log('[i] Transfer Amount:', transferAmount.value);
} else {
const substrateApi = this.#koniState.getSubstrateApi(chain);

Expand Down
47 changes: 27 additions & 20 deletions packages/extension-base/src/services/transaction-service/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,8 @@ export default class TransactionService {
private async sendTransaction (transaction: SWTransaction): Promise<TransactionEmitter> {
let emitter: TransactionEmitter;

console.log('[i] Transaction', transaction);

if (transaction.chainType === 'substrate') {
emitter = this.signAndSendSubstrateTransaction(transaction);
} else if (transaction.chainType === 'evm') {
Expand Down Expand Up @@ -976,6 +978,8 @@ export default class TransactionService {
id
};

console.log('[i] Payload:', payload);

const emitter = new EventEmitter<TransactionEventMap>();

const eventData: TransactionEventResponse = {
Expand Down Expand Up @@ -1030,8 +1034,11 @@ export default class TransactionService {
// emitter.emit('error', eventData);
// });
} else {
this.state.requestService.addConfirmationBitcoin(id, url || EXTENSION_REQUEST_URL, 'bitcoinSendTransactionRequest', payload, {})
this.state.requestService.addConfirmationBitcoin(id, url || EXTENSION_REQUEST_URL, 'bitcoinSendTransactionRequest', payload, {}) //
.then(({ isApproved, payload }) => {
console.log('[i] Is Approved?', isApproved);
console.log('[i] Raw transaction', payload);

if (isApproved) {
if (!payload) {
throw new Error('Bad signature');
Expand All @@ -1041,25 +1048,25 @@ export default class TransactionService {
emitter.emit('signed', eventData);
// Add start info
emitter.emit('send', eventData);
const event = this.chainService.getBitcoinApi(chain).api.sendRawTransaction(payload);

event.on('extrinsicHash', (txHash) => {
eventData.extrinsicHash = txHash;
emitter.emit('extrinsicHash', eventData);
});

event.on('success', (transactionStatus) => {
console.log(transactionStatus);
eventData.blockHash = transactionStatus.block_hash || undefined;
eventData.blockNumber = transactionStatus.block_height || undefined;
eventData.blockTime = transactionStatus.block_time ? (transactionStatus.block_time * 1000) : undefined;
emitter.emit('success', eventData);
});

event.on('error', (error) => {
eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, error));
emitter.emit('error', eventData);
});
// const event = this.chainService.getBitcoinApi(chain).api.sendRawTransaction(payload);

// event.on('extrinsicHash', (txHash) => {
// eventData.extrinsicHash = txHash;
// emitter.emit('extrinsicHash', eventData);
// });
//
// event.on('success', (transactionStatus) => {
// console.log(transactionStatus);
// eventData.blockHash = transactionStatus.block_hash || undefined;
// eventData.blockNumber = transactionStatus.block_height || undefined;
// eventData.blockTime = transactionStatus.block_time ? (transactionStatus.block_time * 1000) : undefined;
// emitter.emit('success', eventData);
// });
//
// event.on('error', (error) => {
// eventData.errors.push(new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, error));
// emitter.emit('error', eventData);
// });
} else {
this.removeTransaction(id);
eventData.errors.push(new TransactionError(BasicTxErrorType.USER_REJECT_REQUEST));
Expand Down