Hf20 testnet appbase

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steemit/dsteem",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Steem blockchain RPC client library",
   "author": "Johan Nordberg",
   "license": "BSD-3-Clause",

src/client.ts

@@ -157,9 +157,10 @@ export class Client {
             opts = copy(options)
             opts.agent = options.agent
         }
-        opts.addressPrefix = 'STX'
-        opts.chainId = '79276aea5d4877d9a25892eaa01b0adf019d3e5cb12a97478df3298ccdd01673'
-        return new Client('https://testnet.steem.vc', opts)
+
+        opts.addressPrefix = 'TST'
+        opts.chainId = '46d82ab7d8db682eb1959aed0ada039a6d49afa1602491f93dde9cac3e8e6c32'
+        return new Client('https://testnet.steemitdev.com', opts)
     }
 
     /**
@@ -229,7 +230,7 @@ export class Client {
      * @param params  Array of parameters to pass to the method, optional.
      *
      */
-    public async call(api: string, method: string, params: any[] = []): Promise<any> {
+    public async call(api: string, method: string, params: any = []): Promise<any> {
         const request: RPCCall = {
             id: ++this.seqNo,
             jsonrpc: '2.0',
@@ -254,7 +255,7 @@ export class Client {
             opts.agent = this.options.agent
         }
         let fetchTimeout: any
-        if (api !== 'network_broadcast_api') {
+        if (api !== 'network_broadcast_api' && method.substring(0, 21) !== 'broadcast_transaction') {
             // bit of a hack to work around some nodes high error rates
             // only effective in node.js (until timeout spec lands in browsers)
             fetchTimeout = (tries) => (tries + 1) * 500

src/helpers/broadcast.ts

@@ -44,8 +44,10 @@ import {
     AccountCreateOperation,
     AccountCreateWithDelegationOperation,
     AccountUpdateOperation,
+    ClaimAccountOperation,
     CommentOperation,
     CommentOptionsOperation,
+    CreateClaimedAccountOperation,
     CustomJsonOperation,
     DelegateVestingSharesOperation,
     Operation,
@@ -167,6 +169,7 @@ export class BroadcastAPI {
      */
     public async createAccount(options: CreateAccountOptions, key: PrivateKey) {
         const {username, metadata, creator} = options
+
         const prefix = this.client.addressPrefix
         let owner: Authority, active: Authority, posting: Authority, memo_key: PublicKey
         if (options.password) {
@@ -187,46 +190,55 @@ export class BroadcastAPI {
         }
 
         let {fee, delegation} = options
-        if (fee === undefined || delegation === undefined) {
-            const [dynamicProps, chainProps] = await Promise.all([
-                this.client.database.getDynamicGlobalProperties(),
-                this.client.database.getChainProperties(),
-            ])
 
-            const sharePrice = getVestingSharePrice(dynamicProps)
+        delegation = Asset.from(delegation || 0, 'VESTS')
+        fee = Asset.from(fee || 0, 'TESTS')
+
+        if (fee.amount > 0) {
+            const chainProps = await this.client.database.getChainProperties()
             const creationFee = Asset.from(chainProps.account_creation_fee)
-            const modifier = 30 // STEEMIT_CREATE_ACCOUNT_WITH_STEEM_MODIFIER
-            const ratio = 5 // STEEMIT_CREATE_ACCOUNT_DELEGATION_RATIO
-
-            const targetDelegation = sharePrice
-                .convert(creationFee.multiply(modifier * ratio))
-                .add('0.000002 VESTS') // add a tiny buffer since we are trying to hit a moving target
-
-            if (delegation !== undefined && fee === undefined) {
-                delegation = Asset.from(delegation, 'VESTS')
-                fee = Asset.max(
-                    sharePrice.convert(targetDelegation.subtract(delegation)).divide(ratio),
-                    creationFee,
-                )
-            } else {
-                fee = Asset.from(fee || creationFee, 'STEEM')
-                delegation = Asset.max(
-                    targetDelegation.subtract(sharePrice.convert(fee.multiply(ratio))),
-                    Asset.from(0, 'VESTS'),
-                )
+            if (fee.amount !== creationFee.amount) {
+                throw new Error('Fee must be exactly ' + creationFee.toString())
             }
         }
-        const op: AccountCreateWithDelegationOperation = ['account_create_with_delegation', {
-            active, creator,
-            delegation: Asset.from(delegation, 'VESTS'),
-            extensions: [],
-            fee: Asset.from(fee, 'STEEM'),
-            json_metadata: metadata ? JSON.stringify(metadata) : '',
-            memo_key,
-            new_account_name: username,
-            owner, posting,
-        }]
-        return this.sendOperations([op], key)
+
+        const claim_op: ClaimAccountOperation = [
+            'claim_account',
+            {
+                creator,
+                extensions: [],
+                fee,
+            }
+        ]
+
+        const create_op: CreateClaimedAccountOperation = [
+            'create_claimed_account',
+            {
+                active,
+                creator,
+                extensions: [],
+                json_metadata: metadata ? JSON.stringify(metadata) : '',
+                memo_key,
+                new_account_name: username,
+                owner, posting,
+            }
+        ]
+
+        const ops: any[] = [claim_op, create_op]
+
+        if (delegation.amount > 0) {
+            const delegate_op: DelegateVestingSharesOperation = [
+                'delegate_vesting_shares',
+                {
+                    delegatee: username,
+                    delegator: creator,
+                    vesting_shares: delegation,
+                }
+            ]
+            ops.push(delegate_op)
+        }
+
+        return this.sendOperations(ops, key)
     }
 
     /**
@@ -300,10 +312,10 @@ export class BroadcastAPI {
     }
 
     /**
-     * Convenience for calling `network_broadcast_api`.
+     * Convenience for calling `condenser_api`.
      */
     public call(method: string, params?: any[]) {
-        return this.client.call('network_broadcast_api', method, params)
+        return this.client.call('condenser_api', method, params)
     }
 
 }

src/helpers/database.ts

@@ -87,7 +87,7 @@ export class DatabaseAPI {
      * Convenience for calling `database_api`.
      */
     public call(method: string, params?: any[]) {
-        return this.client.call('database_api', method, params)
+        return this.client.call('condenser_api', method, params)
     }
 
     /**

src/steem/asset.ts

@@ -39,7 +39,7 @@ import * as ByteBuffer from 'bytebuffer'
 /**
  * Asset symbol string.
  */
-export type AssetSymbol = 'STEEM' | 'VESTS' | 'SBD'
+export type AssetSymbol = 'STEEM' | 'VESTS' | 'SBD' | 'TESTS' | 'TBD'
 
 /**
  * Class representing a steem asset, e.g. `1.000 STEEM` or `12.112233 VESTS`.
@@ -51,7 +51,7 @@ export class Asset {
      */
     public static fromString(string: string, expectedSymbol?: AssetSymbol) {
         const [amountString, symbol] = string.split(' ')
-        if (['STEEM', 'VESTS', 'SBD'].indexOf(symbol) === -1) {
+        if (['STEEM', 'VESTS', 'SBD', 'TESTS', 'TBD'].indexOf(symbol) === -1) {
             throw new Error(`Invalid asset symbol: ${ symbol }`)
         }
         if (expectedSymbol && symbol !== expectedSymbol) {
@@ -107,6 +107,8 @@ export class Asset {
      */
     public getPrecision(): number {
         switch (this.symbol) {
+            case 'TESTS':
+            case 'TBD':
             case 'STEEM':
             case 'SBD':
                 return 3

src/steem/operation.ts

@@ -50,9 +50,10 @@ export type OperationName = // <id>
     | 'account_witness_proxy' // 13
     | 'account_witness_vote' // 12
     | 'cancel_transfer_from_savings' // 34
-    | 'challenge_authority' // 22
     | 'change_recovery_account' // 26
+    | 'claim_account' // 22
     | 'claim_reward_balance' // 39
+    | 'create_claimed_account' // 23
     | 'comment' // 1
     | 'comment_options' // 19
     | 'convert' // 8
@@ -72,7 +73,6 @@ export type OperationName = // <id>
     | 'limit_order_create2' // 21
     | 'pow' // 14
     | 'pow2' // 30
-    | 'prove_authority' // 23
     | 'recover_account' // 25
     | 'report_over_production' // 16
     | 'request_account_recovery' // 24
@@ -194,15 +194,6 @@ export interface CancelTransferFromSavingsOperation extends Operation {
     }
 }
 
-export interface ChallengeAuthorityOperation extends Operation {
-    0: 'challenge_authority' // 22
-    1: {
-        challenger: string // account_name_type
-        challenged: string // account_name_type
-        require_owner: boolean
-    }
-}
-
 /**
  * Each account lists another account as their recovery account.
  * The recovery account has the ability to create account_recovery_requests
@@ -249,6 +240,18 @@ export interface ClaimRewardBalanceOperation extends Operation {
     }
 }
 
+export interface ClaimAccountOperation extends Operation {
+    0: 'claim_account' // 22
+    1: {
+        creator: string // account_name_type
+        fee: string | Asset
+        /**
+         * Extensions. Not currently used.
+         */
+        extensions: any[] // extensions_type
+    }
+}
+
 export interface CommentOperation extends Operation {
     0: 'comment' // 1
     1: {
@@ -288,6 +291,23 @@ export interface ConvertOperation extends Operation {
     }
 }
 
+export interface CreateClaimedAccountOperation extends Operation {
+    0: 'create_claimed_account' // 23
+    1: {
+        creator: string // account_name_type
+        new_account_name: string // account_name_type
+        owner: AuthorityType
+        active: AuthorityType
+        posting: AuthorityType
+        memo_key: string | PublicKey // public_key_type
+        json_metadata: string
+        /**
+         * Extensions. Not currently used.
+         */
+        extensions: any[] // extensions_type
+    }
+}
+
 export interface CustomOperation extends Operation {
     0: 'custom' // 15
     1: {
@@ -547,14 +567,6 @@ export interface Pow2Operation extends Operation {
     }
 }
 
-export interface ProveAuthorityOperation extends Operation {
-    0: 'prove_authority' // 23
-    1: {
-        challenged: string // account_name_type
-        require_owner: boolean
-    }
-}
-
 /**
  * Recover an account to a new authority using a previous authority and verification
  * of the recovery account as proof of identity. This operation can only succeed

src/steem/serializer.ts

@@ -264,18 +264,18 @@ OperationSerializers.cancel_transfer_from_savings = OperationDataSerializer(34,
     ['request_id', UInt32Serializer],
 ])
 
-OperationSerializers.challenge_authority = OperationDataSerializer(22, [
-    ['challenger', StringSerializer],
-    ['challenged', StringSerializer],
-    ['require_owner', BooleanSerializer],
-])
-
 OperationSerializers.change_recovery_account = OperationDataSerializer(26, [
     ['account_to_recover', StringSerializer],
     ['new_recovery_account', StringSerializer],
     ['extensions', ArraySerializer(VoidSerializer)],
 ])
 
+OperationSerializers.claim_account = OperationDataSerializer(22, [
+    ['creator', StringSerializer],
+    ['fee', AssetSerializer],
+    ['extensions', ArraySerializer(VoidSerializer)],
+])
+
 OperationSerializers.claim_reward_balance = OperationDataSerializer(39, [
     ['account', StringSerializer],
     ['reward_steem', AssetSerializer],
@@ -313,6 +313,17 @@ OperationSerializers.convert = OperationDataSerializer(8, [
     ['amount', AssetSerializer],
 ])
 
+OperationSerializers.create_claimed_account = OperationDataSerializer(23, [
+    ['creator', StringSerializer],
+    ['new_account_name', StringSerializer],
+    ['owner', AuthoritySerializer],
+    ['active', AuthoritySerializer],
+    ['posting', AuthoritySerializer],
+    ['memo_key', PublicKeySerializer],
+    ['json_metadata', StringSerializer],
+    ['extensions', ArraySerializer(VoidSerializer)],
+])
+
 OperationSerializers.custom = OperationDataSerializer(15, [
     ['required_auths', ArraySerializer(StringSerializer)],
     ['id', UInt16Serializer],
@@ -420,11 +431,6 @@ OperationSerializers.limit_order_create2 = OperationDataSerializer(21, [
     ['expiration', DateSerializer],
 ])
 
-OperationSerializers.prove_authority = OperationDataSerializer(23, [
-    ['challenged', StringSerializer],
-    ['require_owner', BooleanSerializer],
-])
-
 OperationSerializers.recover_account = OperationDataSerializer(25, [
     ['account_to_recover', StringSerializer],
     ['new_owner_authority', AuthoritySerializer],

test/broadcast.ts

@@ -13,15 +13,15 @@ describe('broadcast', function() {
 
     const client = Client.testnet({agent})
 
-    let acc1, acc2: {username: string, password: string}
+    let acc1, acc2: {username: string, posting: string, active: string}
     before(async function() {
         [acc1, acc2] = await getTestnetAccounts()
     })
 
     const postPermlink = `dsteem-test-${ randomString(7) }`
 
     it('should broadcast', async function() {
-        const key = PrivateKey.fromLogin(acc1.username, acc1.password, 'posting')
+        const key = PrivateKey.fromString(acc1.posting)
         const body = [
             `![picture](https://unsplash.it/1200/800?image=${ ~~(Math.random() * 1085) })`,
             '\n---\n',
@@ -42,7 +42,7 @@ describe('broadcast', function() {
     })
 
     it('should handle concurrent broadcasts', async function() {
-        const key = PrivateKey.fromLogin(acc2.username, acc2.password, 'posting')
+        const key = PrivateKey.from(acc2.posting)
         const commentPromise = client.broadcast.comment({
             parent_author: acc1.username,
             parent_permlink: postPermlink,