[construction] Add support for balances.transfer (#59)

Co-authored-by: Dmitryii Osipov <[email protected]>
gear-foundation · Aug 14, 2023 · dd3e939 · dd3e939
1 parent 6253224
commit dd3e939
Show file tree

Hide file tree

Showing 9 changed files with 190 additions and 39 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -20,7 +20,7 @@ jobs:
         with:
           node-version: 18.x
 
-      - name: Download Gear node
+      - name: Download Gear node [release=build]
         run: wget -O ./gear https://github.com/gear-tech/gear/releases/download/build/gear
 
       - name: Build spec

diff --git a/config/gear-testnet.json b/config/gear-testnet.json
@@ -1,7 +1,7 @@
 {
   "name": "gear_testnet",
   "blockchain": "gear",
-  "network": "gear testnet",
+  "network": "testnet",
   "wsAddress": "wss://archive-node.gear-tech.io",
   "httpAddress": "https://archive-node.gear-tech.io",
   "ss58Format": 42,

diff --git a/server/package.json b/server/package.json
@@ -14,7 +14,8 @@
     "watch:vara": "nodemon src/index.ts --config-name vara",
     "watch:vara-test": "nodemon src/index.ts --config-name vara_testnet",
     "watch:offline": "nodemon src/index.ts --mode offline",
-    "build": "rm -rf dist && tsc"
+    "build": "rm -rf dist && tsc",
+    "lint": "yarn run eslint src/**/*.ts"
   },
   "keywords": [
     "openapi-generator",
@@ -47,6 +48,7 @@
     "winston": "3.10.0"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "latest",
     "@typescript-eslint/parser": "^6.2.0",
     "axios": "^1.4.0",
     "chai": "^5.0.0-alpha.1",

diff --git a/server/src/helpers/construct-tx.ts b/server/src/helpers/construct-tx.ts
@@ -6,44 +6,54 @@ import logger from '../logger';
 import { GearNetworkIdentifier } from '../networks';
 
 export interface TxParams {
-  dest: string;
+  fromAddress: string;
+  toAddress: string;
   value: string;
-  source: string;
   blockHash: string;
   blockNumber: number;
   eraPeriod: number;
   nonce: number;
+  tip: number;
+  specVersion: number;
+  transactionVersion: number;
+  disableKeepAlive: boolean,
   networkIdent: GearNetworkIdentifier;
 }
 
 export function constructTx({
-  dest,
+  fromAddress,
+  toAddress,
   value,
-  source,
   blockHash,
   blockNumber,
   eraPeriod,
   nonce,
-  networkIdent: { genesis, registry, specVersion, transactionVersion, metadataRpc, ss58Format },
+  tip,
+  specVersion,
+  transactionVersion,
+  disableKeepAlive,
+  networkIdent: { genesis, registry, metadataRpc, ss58Format },
 }: TxParams) {
-  const unsigned = methods.balances.transferKeepAlive(
-    { dest: { id: dest }, value },
-    {
-      address: deriveAddress(source, ss58Format),
-      blockHash,
-      blockNumber,
-      eraPeriod,
-      nonce,
-      genesisHash: genesis,
-      metadataRpc: metadataRpc,
-      specVersion,
-      transactionVersion,
-    },
-    {
+  const args = { dest: { id: toAddress }, value };
+  const info = {
+        address: deriveAddress(fromAddress, ss58Format),
+        blockHash,
+        blockNumber,
+        eraPeriod,
+        nonce,
+        tip,
+        genesisHash: genesis,
+        metadataRpc: metadataRpc,
+        specVersion,
+        transactionVersion,
+    };
+  const options = {
       metadataRpc: metadataRpc,
       registry,
-    },
-  );
+    };
+  const unsigned = disableKeepAlive
+    ? methods.balances.transfer(args, info, options)
+    : methods.balances.transferKeepAlive(args, info, options);
 
   const loggedUnsignedTx = unsigned;
   loggedUnsignedTx.metadataRpc = "0x...truncated...";

diff --git a/server/src/helpers/gear.ts b/server/src/helpers/gear.ts
@@ -1,6 +1,6 @@
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { ApiDecoration } from '@polkadot/api/types';
-import { Header, Index, SignedBlock, SyncState } from '@polkadot/types/interfaces';
+import { Header, Index, SignedBlock } from '@polkadot/types/interfaces';
 import { BlockIdentifier, Peer, SyncStatus } from 'rosetta-client';
 
 import { NetworkConfig } from 'types';
@@ -95,11 +95,17 @@ export class GearApi {
     const blockHash = await this.api.rpc.chain.getBlockHash(signingInfo.header.number.unwrap());
     const eraPeriod = signingInfo.mortalLength;
 
+    const runtimeInfo = this.api.runtimeVersion;
+    const specVersion: number = runtimeInfo.specVersion.toNumber();
+    const transactionVersion: number = runtimeInfo.transactionVersion.toNumber();
+
     return {
       nonce,
       blockHash,
       blockNumber,
       eraPeriod,
+      specVersion,
+      transactionVersion
     };
   }
 

diff --git a/server/src/services/ConstructionService.ts b/server/src/services/ConstructionService.ts
@@ -134,7 +134,16 @@ const constructionMetadata = async ({
 const constructionPayloads = async ({
   body: { operations, network_identifier, metadata },
 }: ApiRequest<ConstructionPayloadsRequest>) => {
-  const { nonce, blockHash, blockNumber, eraPeriod } = metadata;
+  const {
+    blockHash,
+    blockNumber,
+    eraPeriod,
+    nonce,
+    tip,
+    specVersion,
+    transactionVersion,
+    disableKeepAlive
+  } = metadata;
 
   const networkIdent = getNetworkIdent(network_identifier);
 
@@ -147,17 +156,21 @@ const constructionPayloads = async ({
 
   const { value } = toOp.amount;
 
-  const dest = toOp.account.address;
-  let source = fromOp.account.address;
+  const fromAddress = fromOp.account.address;
+  const toAddress = toOp.account.address;
 
   const txParams = {
-    dest,
+    fromAddress,
+    toAddress,
     value,
-    source,
     blockHash,
     blockNumber,
     eraPeriod,
     nonce,
+    tip,
+    specVersion,
+    transactionVersion,
+    disableKeepAlive
   };
 
   const { unsignedTx, signingPayload } = constructTx({
@@ -167,7 +180,7 @@ const constructionPayloads = async ({
 
   const payloads = [
     {
-      account_identifier: new AccountIdentifier(source),
+      account_identifier: new AccountIdentifier(fromAddress),
       hex_bytes: signingPayload,
       signature_type: 'ed25519',
     },

diff --git a/test/development/gear.ros b/test/development/gear.ros
@@ -1,6 +1,6 @@
 create_account(1){
   create{
-    network = {"network":"Development", "blockchain":"Gear"};
+    network = {"network":"development", "blockchain":"gear"};
     key = generate_key({"curve_type": "edwards25519"});
     account = derive({
       "network_identifier": {{network}},
@@ -16,7 +16,7 @@ create_account(1){
 
 transfer(1){
   transfer{
-    transfer.network = {"network":"Development", "blockchain":"Gear"};
+    transfer.network = {"network":"development", "blockchain":"gear"};
     currency = {"symbol":"GRT", "decimals":12};
 
     sender = find_balance({

diff --git a/test/testnet/gear.ros b/test/testnet/gear.ros
@@ -1,6 +1,6 @@
 create_account(1){
   create{
-    network = {"network":"Gear Staging Testnet V7", "blockchain":"Gear"};
+    network = {"network":"testnet", "blockchain":"gear"};
     key = generate_key({"curve_type": "edwards25519"});
     account = derive({
       "network_identifier": {{network}},
@@ -16,7 +16,7 @@ create_account(1){
 
 transfer(1){
   transfer{
-    transfer.network = {"network":"Gear Staging Testnet V7", "blockchain":"Gear"};
+    transfer.network = {"network":"testnet", "blockchain":"gear"};
     currency = {"symbol":"GRT", "decimals":12};
 
     sender = find_balance({