Add support for Preview 10 operations when assembling Soroban transactions. #108
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,31 +13,29 @@ import { SorobanRpc } from "./soroban_rpc"; | |
| export function assembleTransaction( | ||
| raw: Transaction | FeeBumpTransaction, | ||
| networkPassphrase: string, | ||
| simulation: SorobanRpc.SimulateTransactionResponse | ||
| ): Transaction { | ||
| if ("innerTransaction" in raw) { | ||
| // TODO: Handle feebump transactions | ||
| return assembleTransaction( | ||
| raw.innerTransaction, | ||
| networkPassphrase, | ||
| simulation | ||
| ); | ||
| } | ||
|
|
||
| if (!isSorobanTransaction(raw)) { | ||
| throw new TypeError( | ||
| "unsupported transaction: must contain exactly one " + | ||
| "invokeHostFunction, bumpFootprintExpiration, or restoreFootprint " + | ||
| "operation" | ||
| ); | ||
| } | ||
|
|
||
| if (simulation.results.length !== 1) { | ||
| throw new Error(`simulation results invalid: ${simulation.results}`); | ||
| } | ||
|
|
||
| const source = new Account(raw.source, `${parseInt(raw.sequence, 10) - 1}`); | ||
| const classicFeeNum = parseInt(raw.fee, 10) || 0; | ||
| const minResourceFeeNum = parseInt(simulation.minResourceFee, 10) || 0; | ||
|
|
@@ -61,25 +59,63 @@ export function assembleTransaction( | |
| extraSigners: raw.extraSigners, | ||
| }); | ||
|
|
||
| switch (raw.operations[0].type) { | ||
| case "invokeHostFunction": | ||
| const invokeOp: Operation.InvokeHostFunction = raw.operations[0]; | ||
| txnBuilder.addOperation( | ||
| Operation.invokeHostFunction({ | ||
| source: invokeOp.source, | ||
| func: invokeOp.func, | ||
| // apply the auth from the simulation | ||
| auth: (invokeOp.auth ?? []).concat( | ||
| simulation.results[0].auth?.map((a: string) => | ||
| xdr.SorobanAuthorizationEntry.fromXDR(a, "base64") | ||
| ) ?? [] | ||
| ), | ||
| }) | ||
| ); | ||
| break; | ||
|
|
||
| case "bumpFootprintExpiration": | ||
| const bumpOp: Operation.BumpFootprintExpiration = raw.operations[0]; | ||
| txnBuilder.addOperation( | ||
|
There was a problem hiding this comment. since this and restore case are not merging any data from simulation, can it reduce to There was a problem hiding this comment. I thought so, too, but kept getting some TypeScript errors... tried it again in ea8ccb3 and it worked 🤦 Great call, thank you! |
||
| Operation.bumpFootprintExpiration({ | ||
| source: bumpOp.source, | ||
| ledgersToExpire: bumpOp.ledgersToExpire, | ||
| }) | ||
| ); | ||
| break; | ||
|
|
||
| case "restoreFootprint": | ||
| const restoreOp: Operation.RestoreFootprint = raw.operations[0]; | ||
| txnBuilder.addOperation( | ||
| Operation.restoreFootprint({ source: restoreOp.source }) | ||
| ); | ||
| break; | ||
| } | ||
|
|
||
| // apply the pre-built Soroban Tx Data from simulation onto the Tx | ||
| const sorobanTxData = xdr.SorobanTransactionData.fromXDR( | ||
| simulation.transactionData, | ||
| "base64" | ||
| ); | ||
| txnBuilder.setSorobanData(sorobanTxData); | ||
|
|
||
| return txnBuilder.build(); | ||
| } | ||
|
|
||
| function isSorobanTransaction(tx: Transaction): boolean { | ||
| if (tx.operations.length !== 1) { | ||
| return false; | ||
| } | ||
|
|
||
| switch (tx.operations[0].type) { | ||
| case "invokeHostFunction": | ||
| case "bumpFootprintExpiration": | ||
| case "restoreFootprint": | ||
| return true; | ||
|
|
||
| default: | ||
| return false; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note that previously we weren't copying the source