[draft] Update library to match upcoming testnet RPC and XDR updates

package.json

@@ -145,7 +145,7 @@
     "eventsource": "^2.0.2",
     "lodash": "^4.17.21",
     "randombytes": "^2.1.0",
-    "stellar-base": "10.0.0-soroban.6",
+    "stellar-base": "git+https://github.com/stellar/js-stellar-base#c909f1c",
     "toml": "^3.0.0",
     "urijs": "^1.19.1"
   }

src/server.ts

@@ -210,9 +210,8 @@ export class Server {
     let contractKey: string = xdr.LedgerKey.contractData(
       new xdr.LedgerKeyContractData({
         contract: scAddress,
-        key,
         durability: xdrDurability,
-        bodyType: xdr.ContractEntryBodyType.dataEntry()   // expirationExtension is internal
+        key,
       })
     ).toXDR("base64");
 
@@ -221,13 +220,16 @@ export class Server {
       "getLedgerEntries",
       [contractKey],
     ).then(response => {
-        const ledgerEntries = response.entries ?? [];
+      const ledgerEntries = response.entries ?? [];
       if (ledgerEntries.length !== 1) {
         return Promise.reject({
           code: 404,
-          message: `Contract data not found. Contract: ${Address.fromScAddress(scAddress).toString()}, Key: ${key.toXDR("base64")}, Durability: ${durability}`,
+          message: `Contract data not found. Contract: ${
+            Address.fromScAddress(scAddress).toString()
+          }, Key: ${key.toXDR("base64")}, Durability: ${durability}`,
         });
       }
+
       return ledgerEntries[0];
     });
   }

test/unit/server/get_contract_data_test.js

@@ -34,12 +34,11 @@ describe("Server#getContractData", function () {
           [
             xdr.LedgerKey.contractData(
               new xdr.LedgerKeyContractData({
+                key,
                 contract: new SorobanClient.Contract(address)
                   .address()
                   .toScAddress(),
-                key,
                 durability: xdr.ContractDataDurability.persistent(),
-                bodyType: xdr.ContractEntryBodyType.dataEntry(),
               })
             ).toXDR("base64"),
           ],
@@ -77,12 +76,11 @@ describe("Server#getContractData", function () {
           [
             xdr.LedgerKey.contractData(
               new xdr.LedgerKeyContractData({
+                key,
                 contract: new SorobanClient.Contract(address)
                   .address()
                   .toScAddress(),
-                key,
                 durability: xdr.ContractDataDurability.temporary(),
-                bodyType: xdr.ContractEntryBodyType.dataEntry(),
               })
             ).toXDR("base64"),
           ],

test/unit/server/simulate_transaction_test.js

@@ -19,7 +19,7 @@ describe("Server#simulateTransaction", function () {
         instructions: 0,
         readBytes: 0,
         writeBytes: 0,
-        extendedMetaDataSizeBytes: 0,
+        contractEventsSizeBytes: 0,
       }),
       refundableFee: SorobanClient.xdr.Int64.fromString("0"),
       ext: new SorobanClient.xdr.ExtensionPoint(0),
@@ -36,14 +36,14 @@ describe("Server#simulateTransaction", function () {
                 address: address,
                 nonce: new SorobanClient.xdr.Int64(1234),
                 signatureExpirationLedger: 1,
-                signatureArgs: [],
+                signature: SorobanClient.nativeToScVal(null),
               })
             ),
           // Basic fake invocation
           rootInvocation: new SorobanClient.xdr.SorobanAuthorizedInvocation({
             function:
               SorobanClient.xdr.SorobanAuthorizedFunction.sorobanAuthorizedFunctionTypeContractFn(
-                new SorobanClient.xdr.SorobanAuthorizedContractFunction({
+                new SorobanClient.xdr.InvokeContractArgs({
                   contractAddress: address,
                   functionName: "test",
                   args: [],
@@ -78,7 +78,11 @@ describe("Server#simulateTransaction", function () {
         .addOperation(
           SorobanClient.Operation.invokeHostFunction({
             func: new SorobanClient.xdr.HostFunction.hostFunctionTypeInvokeContract(
-              []
+              new SorobanClient.xdr.InvokeContractArgs({
+                contractAddress: address,
+                functionName: "",
+                args: [],
+              })
             ),
             auth: [],
           })

test/unit/transaction_test.js

@@ -16,14 +16,14 @@ describe("assembleTransaction", () => {
         address: scAddress,
         nonce: new xdr.Int64(0),
         signatureExpirationLedger: 1,
-        signatureArgs: [],
+        signature: xdr.ScVal.scvVoid(),
       })
     ),
     // And a basic invocation
     rootInvocation: new xdr.SorobanAuthorizedInvocation({
       function:
         xdr.SorobanAuthorizedFunction.sorobanAuthorizedFunctionTypeContractFn(
-          new xdr.SorobanAuthorizedContractFunction({
+          new xdr.InvokeContractArgs({
             contractAddress: scAddress,
             functionName: "fn",
             args: [],
@@ -33,20 +33,9 @@ describe("assembleTransaction", () => {
     }),
   });
 
-  const sorobanTransactionData = new xdr.SorobanTransactionData({
-    resources: new xdr.SorobanResources({
-      footprint: new xdr.LedgerFootprint({
-        readOnly: [],
-        readWrite: [],
-      }),
-      instructions: 0,
-      readBytes: 5,
-      writeBytes: 0,
-      extendedMetaDataSizeBytes: 0,
-    }),
-    refundableFee: xdr.Int64.fromString("0"),
-    ext: new xdr.ExtensionPoint(0),
-  });
+  const sorobanTransactionData = new SorobanClient.SorobanDataBuilder()
+    .setResources(0, 5, 0)
+    .build();
 
   const simulationResponse = {
     transactionData: sorobanTransactionData.toXDR("base64"),
@@ -72,18 +61,21 @@ describe("assembleTransaction", () => {
     );
 
     function singleContractFnTransaction(auth) {
-      return new SorobanClient.TransactionBuilder(source, {
-        fee: 100,
-        networkPassphrase: "Test",
-        v1: true,
-      })
+      return new SorobanClient.TransactionBuilder(source, { fee: 100 })
+        .setNetworkPassphrase("Test")
+        .setTimeout(SorobanClient.TimeoutInfinite)
         .addOperation(
           SorobanClient.Operation.invokeHostFunction({
-            func: new xdr.HostFunction.hostFunctionTypeInvokeContract([]),
+            func: new xdr.HostFunction.hostFunctionTypeInvokeContract(
+              new xdr.InvokeContractArgs({
+                contractAddress: scAddress,
+                functionName: "empty",
+                args: [],
+              })
+            ),
             auth: auth ?? [],
           })
         )
-        .setTimeout(SorobanClient.TimeoutInfinite)
         .build();
     }