modified readfromsmart contract transaction, prepare-sign-execute transaction actions

Author: philbuuza

components/overledger/actions/execute-signed-transaction/execute-signed-transaction.mjs

@@ -11,12 +11,12 @@ export default {
     requestId: {
       type: "string",
       label: "Request ID",
-      description: "The ID of the request for executing a signed transaction.",
+      description: "The Overledger identifier assigned to the related transaction preparation request. This should be set to the requestId parameter found in the response object of the 'Prepare a Smart Contract Transaction' Overledger action.",
     },
     signedTransaction: {
       type: "string",
       label: "Signed Transaction",
-      description: "The signed transaction data.",
+      description: "The raw transaction bytecode after signing. This should be set to the signed parameter found in the response object of the 'Sign a Transaction' Overledger action.",
       optional: true,
     },
   },

components/overledger/actions/prepare-smart-contract-transaction/prepare-smart-contract-transaction.mjs

@@ -1,5 +1,5 @@
 import {
-  NETWORK_OPTIONS, TECHNOLOGY_OPTIONS,
+  NETWORK_OPTIONS, TECHNOLOGY_OPTIONS
 } from "../../common/constants.mjs";
 import { parseObject } from "../../common/utils.mjs";
 import overledger from "../../overledger.app.mjs";
@@ -22,19 +22,19 @@ export default {
     signingAccountId: {
       type: "string",
       label: "Signing Account ID",
-      description: "The blockchain account that will sign the transaction.",
-    },
-    functionName: {
-      type: "string",
-      label: "Function Name",
-      description: "The name of the function to call on the smart contract.",
+      description: "The blockchain account (address) that you will be sending this transaction",
     },
     smartContractId: {
       type: "string",
       label: "Smart Contract ID",
       description: "The ID/address of the smart contract to interact with.",
 
     },
+    functionName: {
+      type: "string",
+      label: "Function Name",
+      description: "The name of the function to call on the smart contract.",
+    },
     inputParameters: {
       type: "string[]",
       label: "Input Parameters",
@@ -55,18 +55,20 @@ export default {
     return props;
   },
   async run({ $ }) {
+    const requestBody = {
+      location: {
+        technology: this.locationTechnology,
+        network: this.locationNetwork,
+      },
+      signingAccountId: this.signingAccountId,
+      functionName: this.functionName,
+      smartContractId: this.smartContractId,
+      inputParameters: parseObject(this.inputParameters),
+    }
+
     const response = await this.overledger.prepareSmartContractTransaction({
       $,
-      data: {
-        location: {
-          technology: this.locationTechnology,
-          network: this.locationNetwork,
-        },
-        signingAccountId: this.signingAccountId,
-        functionName: this.functionName,
-        smartContractId: this.smartContractId,
-        inputParameters: this.inputParameters && parseObject(this.inputParameters),
-      },
+      data: requestBody,
     });
     $.export("$summary", "Smart contract transaction prepared successfully");
     return response;

components/overledger/actions/read-from-a-smart-contract/read-from-smart-contract.mjs

@@ -65,17 +65,12 @@ export default {
       smartContractId: this.smartContractId,
       outputParameters: parseObject(this.outputParameters),
     };
-
-    try {
       // Make the API call to Overledger
       const response = await this.overledger.readFromSmartContract({
         $,
         data: requestBody,
       });
       $.export("$summary", `Successfully read from contract: ${this.smartContractId}`);
       return response;
-    } catch (error) {
-      throw new Error(`Failed to read from smart contract: ${error.message}`);
-    }
   },
 };

components/overledger/actions/sign-a-transaction/sign-a-transaction.mjs

@@ -1,4 +1,5 @@
 import overledger from "../../overledger.app.mjs";
+import { UNIT_OPTIONS } from "../../common/constants.mjs";
 
 export default {
   key: "overledger-sign-smart-contract-transaction",
@@ -16,27 +17,50 @@ export default {
     requestId: {
       type: "string",
       label: "requestId",
-      description: "The Overledger identifier assigned to the related transaction preparation request. This should be set to the requestId parameter found in the response object of the 'Prepare a Smart Contract Transaction' Overledger action.",
+      description: "The ID assigned to a preparation request in Overledger. This should be set to the requestId parameter found in the response object of the 'Prepare Smart Contract Transaction' Overledger action.",
     },
     transactionSigningResponderName: {
       type: "string",
-      label: "Transaction Signing Responder",
+      label: "Transaction Signing Responder Name",
       description: "The name of the Transaction Signing Responder you would like to use. The CTA Transaction Signing Responder is the Quant-provided signer for testnet accounts.",
     },
     nativeData: {
       type: "object",
       label: "the transaction data required to be signed",
       description: "A JSON object representing the transaction required to be signed.",
     },
+    locationTechnology: {
+      type: "string",
+      label: "Location Technology",
+      description: "The blockchain technology used for this transaction, e.g., ethereum, substrate.",
+      optional: true,
+      // Reference the output of the previous step
+      default: ({ steps }) => steps.prepare_smart_contract_transaction?.locationTechnology,
+    },
   },
   async run({ $ }) {
+    const gatewayFee = {
+      amount: "100",
+      unit: "QNT",
+    };
+    // Define DLT Fee and dynamically set the 'unit' from UNIT_OPTIONS
+    const dltFee = {
+      amount: "0.000019897764079968",
+      unit: UNIT_OPTIONS[this.locationTechnology] || "ETH" // Use default if not found
+    };
     // Sign the transaction
+    const requestBody = {
+      keyId: this.keyId,
+      gatewayFee: gatewayFee,
+      requestId: this.requestId,
+      dltFee: dltFee,
+      nativeData: this.nativeData,
+      transactionSigningResponderName: this.transactionSigningResponderName,
+    }
+
     const response = await this.overledger.signTransaction({
       $,
-      data: {
-        requestId: this.requestId,
-        nativeData: this.nativeData,
-      },
+      data: requestBody,
     });
     $.export("$summary", "Transaction signed successfully");
     return response;

components/overledger/common/constants.mjs

@@ -50,3 +50,11 @@ export const NETWORK_OPTIONS = {
     "Sandbox",
   ],
 };
+
+export const UNIT_OPTIONS = {
+  "ethereum": "ETH",               // Ethereum's token symbol is ETH
+  "substrate": "DOT",              // Polkadot's token symbol is DOT
+  "xrp ledger": "XRP",             // XRP Ledger's token symbol is XRP
+  "bitcoin": "BTC",                // Bitcoin's token symbol is BTC
+  "hyperledger fabric": "FAB",     // Placeholder for Hyperledger Fabric's token symbol
+};

components/overledger/overledger.app.mjs

@@ -14,6 +14,9 @@ export default {
     _baseUrl() {
       return "https://api.overledger.io";
     },
+    _sanboxBaseUrl(){
+      return "https://api.sandbox.overledger.io";
+    },
     _headers() {
       return {
         "Authorization": `Bearer ${this.$auth.oauth_access_token}`,
@@ -33,23 +36,23 @@ export default {
     prepareSmartContractTransaction(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._baseUrl(),
+        baseUrl: this._sanboxBaseUrl(),
         path: "/api/preparations/transactions/smart-contracts/write",
         ...opts,
       });
     },
     readFromSmartContract(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._baseUrl(),
+        baseUrl: this._sanboxBaseUrl(),
         path: "/api/smart-contracts/read",
         ...opts,
       });
     },
     signTransaction(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: "https://api.sandbox.overledger.io",
+        baseUrl: this._sanboxBaseUrl(),
         path: "/api/transaction-signing-sandbox",
         ...opts,
       });