Merge pull request #110 from API-market/master

Merge EOS - support no resources for create account
Open-Rights-Exchange · Jan 12, 2022 · 12286b4 · 12286b4
2 parents 646cd6b + 29f8f68
commit 12286b4
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 67 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-rights-exchange/chainjs",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Javascript helper library providing plug-in interfaces to multiple block chains.",
   "main": "./dist/index.js",
   "scripts": {

diff --git a/src/chains/eos_2/templates/chainActions/chainSpecific/account_create.ts b/src/chains/eos_2/templates/chainActions/chainSpecific/account_create.ts
@@ -13,6 +13,7 @@ import {
   getFirstAuthorizationIfOnlyOneExists,
   toEosEntityNameOrNull,
   toEosPublicKeyOrNull,
+  EosAssetHelper,
 } from '../../../helpers'
 
 const actionName = 'newaccount'
@@ -38,76 +39,87 @@ export const composeAction = ({
   stakeNetQuantity,
   stakeCpuQuantity,
   transfer,
-}: CreateAccountNativeParams): EosActionStruct[] => [
-  {
-    account: toEosEntityName('eosio'),
-    name: actionName,
-    authorization: [
-      {
-        actor: creatorAccountName,
-        permission: creatorPermission,
-      },
-    ],
-    data: {
-      creator: creatorAccountName,
-      name: accountName,
-      owner: {
-        threshold: 1,
-        keys: [
-          {
-            key: publicKeyOwner,
-            weight: 1,
-          },
-        ],
-        accounts: Array<any>(),
-        waits: Array<any>(),
-      },
-      active: {
-        threshold: 1,
-        keys: [
-          {
-            key: publicKeyActive,
-            weight: 1,
-          },
-        ],
-        accounts: Array<any>(),
-        waits: Array<any>(),
+}: CreateAccountNativeParams): EosActionStruct[] => {
+  const actions: EosActionStruct[] = [
+    {
+      account: toEosEntityName('eosio'),
+      name: actionName,
+      authorization: [
+        {
+          actor: creatorAccountName,
+          permission: creatorPermission,
+        },
+      ],
+      data: {
+        creator: creatorAccountName,
+        name: accountName,
+        owner: {
+          threshold: 1,
+          keys: [
+            {
+              key: publicKeyOwner,
+              weight: 1,
+            },
+          ],
+          accounts: Array<any>(),
+          waits: Array<any>(),
+        },
+        active: {
+          threshold: 1,
+          keys: [
+            {
+              key: publicKeyActive,
+              weight: 1,
+            },
+          ],
+          accounts: Array<any>(),
+          waits: Array<any>(),
+        },
       },
     },
-  },
-  {
-    account: toEosEntityName('eosio'),
-    name: 'buyrambytes',
-    authorization: [
-      {
-        actor: creatorAccountName,
-        permission: creatorPermission,
+    {
+      account: toEosEntityName('eosio'),
+      name: 'buyrambytes',
+      authorization: [
+        {
+          actor: creatorAccountName,
+          permission: creatorPermission,
+        },
+      ],
+      data: {
+        payer: creatorAccountName,
+        receiver: accountName,
+        bytes: ramBytes,
       },
-    ],
-    data: {
-      payer: creatorAccountName,
-      receiver: accountName,
-      bytes: ramBytes,
     },
-  },
-  {
-    account: toEosEntityName('eosio'),
-    name: 'delegatebw',
-    authorization: [
-      {
-        actor: creatorAccountName,
-        permission: creatorPermission,
+  ]
+
+  // add delegatebw action to stake resources (if non-zero)
+  const { amount: netAmount } = new EosAssetHelper(null, null, stakeNetQuantity)
+  const { amount: cpuAmount } = new EosAssetHelper(null, null, stakeCpuQuantity)
+  if (parseFloat(netAmount) !== 0 || parseFloat(cpuAmount) !== 0) {
+    // Note: Float won't handle high precision numbers (which shouldnt be a problem with EOS)
+    actions.push({
+      account: toEosEntityName('eosio'),
+      name: 'delegatebw',
+      authorization: [
+        {
+          actor: creatorAccountName,
+          permission: creatorPermission,
+        },
+      ],
+      data: {
+        from: creatorAccountName,
+        receiver: accountName,
+        stake_net_quantity: stakeNetQuantity,
+        stake_cpu_quantity: stakeCpuQuantity,
+        transfer,
       },
-    ],
-    data: {
-      from: creatorAccountName,
-      receiver: accountName,
-      stake_net_quantity: stakeNetQuantity,
-      stake_cpu_quantity: stakeCpuQuantity,
-      transfer,
-    },
-  },
-]
+    })
+  }
+
+  return actions
+}
 
 export const decomposeAction = (action: EosActionStruct): EosDecomposeReturn => {
   const { name, data, authorization } = action