Skip to content

Commit

Permalink
Merge pull request #82 from Soneso/soroba_20.0.0_prep
Browse files Browse the repository at this point in the history 
Soroba 20.0.2 prep
  • Loading branch information
@christian-rogobete
christian-rogobete authored Dec 18, 2023
2 parents 2ccec79 + 7d19207 commit 8137bf0
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 122 deletions.
43 changes: 26 additions & 17 deletions lib/src/responses/asset_response.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,29 @@ class AssetResponse extends Response {
AssetResponseLinks links;
int? numContracts;
String? contractsAmount;
int? numArchivedContracts;
String? archivedContractsAmount;

AssetResponse(
this.assetType,
this.assetCode,
this.assetIssuer,
this.accounts,
this.numClaimableBalances,
this.balances,
this.claimableBalancesAmount,
this.pagingToken,
this.amount,
this.numAccounts,
this.numLiquidityPools,
this.liquidityPoolsAmount,
this.flags,
this.links,
{this.numContracts,
this.contractsAmount});
this.assetType,
this.assetCode,
this.assetIssuer,
this.accounts,
this.numClaimableBalances,
this.balances,
this.claimableBalancesAmount,
this.pagingToken,
this.amount,
this.numAccounts,
this.numLiquidityPools,
this.liquidityPoolsAmount,
this.flags,
this.links, {
this.numContracts,
this.contractsAmount,
this.numArchivedContracts,
this.archivedContractsAmount,
});

Asset get asset {
return Asset.create(this.assetType, this.assetCode, this.assetIssuer);
Expand All @@ -66,7 +71,11 @@ class AssetResponse extends Response {
numContracts: json['num_contracts'] == null
? null
: convertInt(json['num_contracts']!)!,
contractsAmount: json['contracts_amount'])
contractsAmount: json['contracts_amount'],
numArchivedContracts: json['num_archived_contracts'] == null
? null
: convertInt(json['num_archived_contracts']!)!,
archivedContractsAmount: json['archived_contracts_amount'])
..rateLimitLimit = convertInt(json['rateLimitLimit'])
..rateLimitRemaining = convertInt(json['rateLimitRemaining'])
..rateLimitReset = convertInt(json['rateLimitReset']);
Expand Down
4 changes: 1 addition & 3 deletions lib/src/responses/operations/extend_footprint_ttl_operation_response.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ class ExtendFootprintTTLOperationResponse extends OperationResponse {
factory ExtendFootprintTTLOperationResponse.fromJson(
Map<String, dynamic> json) =>
ExtendFootprintTTLOperationResponse(convertInt(
json['ledgers_to_expire'] == null
? json['extend_to']
: json['ledgers_to_expire'])!)
json['extend_to'])!)
..id = int.tryParse(json['id'])
..sourceAccount =
json['source_account'] == null ? null : json['source_account']
Expand Down
79 changes: 57 additions & 22 deletions lib/src/soroban/soroban_server.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,10 @@ class SorobanServer {
/// expected ledger footprint, and expected costs.
/// See: https://soroban.stellar.org/api/methods/simulateTransaction
Future<SimulateTransactionResponse> simulateTransaction(
Transaction transaction) async {
String transactionEnvelopeXdr = transaction.toEnvelopeXdrBase64();
SimulateTransactionRequest request) async {

JsonRpcMethod getAccount =
JsonRpcMethod("simulateTransaction", args: transactionEnvelopeXdr);
JsonRpcMethod("simulateTransaction", args: request.getRequestArgs());
dio.Response response = await _dio.post(_serverUrl,
data: json.encode(getAccount), options: dio.Options(headers: _headers));
if (enableLogging) {
Expand Down Expand Up @@ -263,7 +262,7 @@ class GetLatestLedgerResponse extends SorobanRpcResponse {
String? id;

/// Stellar Core protocol version associated with the latest ledger.
String? protocolVersion;
int? protocolVersion;

/// Sequence number of the latest ledger.
int? sequence;
Expand Down Expand Up @@ -313,7 +312,7 @@ class GetLedgerEntriesResponse extends SorobanRpcResponse {
List<LedgerEntry>? entries;

/// The current latest ledger observed by the node when this response was generated.
String? latestLedger;
int? latestLedger;

GetLedgerEntriesResponse(Map<String, dynamic> jsonResponse)
: super(jsonResponse);
Expand All @@ -340,10 +339,10 @@ class LedgerEntry {
String xdr;

/// The ledger number of the last time this entry was updated (optional)
String lastModifiedLedgerSeq;
int lastModifiedLedgerSeq;

/// The ledger sequence number after which the ledger entry would expire. This field exists only for ContractCodeEntry and ContractDataEntry ledger entries (optional).
String? liveUntilLedgerSeq;
int? liveUntilLedgerSeq;

XdrLedgerEntryData get ledgerEntryDataXdr =>
XdrLedgerEntryData.fromBase64EncodedXdrString(xdr);
Expand All @@ -354,8 +353,8 @@ class LedgerEntry {
factory LedgerEntry.fromJson(Map<String, dynamic> json) {
String key = json['key'];
String xdr = json['xdr'];
String lastModifiedLedgerSeq = json['lastModifiedLedgerSeq'];
String? liveUntilLedgerSeq = json['liveUntilLedgerSeq'];
int lastModifiedLedgerSeq = json['lastModifiedLedgerSeq'];
int? liveUntilLedgerSeq = json['liveUntilLedgerSeq'];
return LedgerEntry(key, xdr, lastModifiedLedgerSeq, liveUntilLedgerSeq);
}
}
Expand All @@ -364,7 +363,7 @@ class LedgerEntry {
class GetNetworkResponse extends SorobanRpcResponse {
String? friendbotUrl;
String? passphrase;
String? protocolVersion;
int? protocolVersion;

GetNetworkResponse(Map<String, dynamic> jsonResponse) : super(jsonResponse);

Expand Down Expand Up @@ -405,11 +404,46 @@ class RestorePreamble {
}
}

/// Part of the SimulateTransactionRequest.
/// Allows budget instruction leeway used in preflight calculations to be configured.
class ResourceConfig {
int instructionLeeway;

ResourceConfig(this.instructionLeeway);

Map<String, dynamic> getRequestArgs() {
var map = <String, dynamic>{};
map['instructionLeeway'] = instructionLeeway;
return map;
}
}
/// Holds the request parameters for simulateTransaction.
/// See: https://soroban.stellar.org/api/methods/simulateTransaction
class SimulateTransactionRequest {
/// The transaction to be submitted.
Transaction transaction;

/// Allows budget instruction leeway used in preflight calculations to be configured
/// If not provided the leeway defaults to 3000000 instructions
ResourceConfig? resourceConfig;

SimulateTransactionRequest(this.transaction, {this.resourceConfig});

Map<String, dynamic> getRequestArgs() {
var map = <String, dynamic>{};
map['transaction'] = transaction.toEnvelopeXdrBase64();
if (resourceConfig != null) {
map['resourceConfig'] = resourceConfig!.getRequestArgs();
}
return map;
}
}

/// Response that will be received when submitting a trial contract invocation.
/// See: https://soroban.stellar.org/api/methods/simulateTransaction
class SimulateTransactionResponse extends SorobanRpcResponse {
/// Stringified-number of the current latest ledger observed by the node when this response was generated.
String? latestLedger;
/// number of the current latest ledger observed by the node when this response was generated.
int? latestLedger;

/// If error is present then results will not be in the response
/// There will be one results object for each operation in the transaction.
Expand Down Expand Up @@ -558,7 +592,7 @@ class SendTransactionResponse extends SorobanRpcResponse {
String? status;

/// The latest ledger known to Soroban-RPC at the time it handled the sendTransaction() request.
String? latestLedger;
int? latestLedger;

/// The unix timestamp of the close time of the latest ledger known to Soroban-RPC at the time it handled the sendTransaction() request.
String? latestLedgerCloseTime;
Expand Down Expand Up @@ -596,19 +630,19 @@ class GetTransactionResponse extends SorobanRpcResponse {
String? status;

/// The latest ledger known to Soroban-RPC at the time it handled the getTransaction() request.
String? latestLedger;
int? latestLedger;

/// The unix timestamp of the close time of the latest ledger known to Soroban-RPC at the time it handled the getTransaction() request.
String? latestLedgerCloseTime;

/// The oldest ledger ingested by Soroban-RPC at the time it handled the getTransaction() request.
String? oldestLedger;
int? oldestLedger;

/// The unix timestamp of the close time of the oldest ledger ingested by Soroban-RPC at the time it handled the getTransaction() request.
String? oldestLedgerCloseTime;

/// (optional) The sequence of the ledger which included the transaction. This field is only present if status is SUCCESS or FAILED.
String? ledger;
int? ledger;

/// (optional) The unix timestamp of when the transaction was included in the ledger. This field is only present if status is SUCCESS or FAILED.
String? createdAt;
Expand Down Expand Up @@ -709,11 +743,11 @@ class GetTransactionResponse extends SorobanRpcResponse {
/// Holds the request parameters for getEvents.
/// See: https://soroban.stellar.org/api/methods/getEvents
class GetEventsRequest {
/// Stringified ledger sequence number to fetch events after (inclusive).
/// ledger sequence number to fetch events after (inclusive).
/// The getEvents method will return an error if startLedger is less than the oldest ledger stored in this node,
/// or greater than the latest ledger seen by this node.
/// If a cursor is included in the request, startLedger must be omitted.
String? startLedger;
int? startLedger;

/// List of filters for the returned events. Events matching any of the filters are included.
/// To match a filter, an event must match both a contractId and a topic.
Expand Down Expand Up @@ -822,7 +856,7 @@ class PaginationOptions {
}

class GetEventsResponse extends SorobanRpcResponse {
String? latestLedger;
int? latestLedger;

/// If error is present then results will not be in the response
List<EventInfo>? events;
Expand All @@ -846,16 +880,17 @@ class GetEventsResponse extends SorobanRpcResponse {

class EventInfo {
String type;
String ledger;
int ledger;
String ledgerCloseAt;
String contractId;
String id;
String paginationToken;
List<String> topic;
String value;
bool inSuccessfulContractCall;

EventInfo(this.type, this.ledger, this.ledgerCloseAt, this.contractId,
this.id, this.paginationToken, this.topic, this.value);
this.id, this.paginationToken, this.topic, this.value, this.inSuccessfulContractCall);

factory EventInfo.fromJson(Map<String, dynamic> json) {
List<String> topic = List<String>.from(json['topic'].map((e) => e));
Expand All @@ -868,7 +903,7 @@ class EventInfo {
}

return EventInfo(json['type'], json['ledger'], json['ledgerClosedAt'],
json['contractId'], json['id'], json['pagingToken'], topic, value);
json['contractId'], json['id'], json['pagingToken'], topic, value, json['inSuccessfulContractCall']);
}
}

Expand Down
Loading

0 comments on commit 8137bf0

Please sign in to comment.