[worker] consistent api, create shard identifier internally and take …

…string as arg
encointer · Apr 11, 2024 · 2f80f1f · 2f80f1f
1 parent 84fd409
commit 2f80f1f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/worker-api/src/integriteeWorker.spec.ts b/packages/worker-api/src/integriteeWorker.spec.ts
@@ -4,7 +4,6 @@ import { localDockerNetwork } from './testUtils/networks.js';
 import { IntegriteeWorker } from './integriteeWorker.js';
 import WS from 'websocket';
 import {type KeyringPair} from "@polkadot/keyring/types";
-import bs58 from "bs58";
 
 const {w3cwebsocket: WebSocket} = WS;
 
@@ -75,7 +74,7 @@ describe('worker', () => {
 
         describe('balance transfer should work', () => {
             it('should return value', async () => {
-                const shard = worker.createType('ShardIdentifier', bs58.decode(network.mrenclave));
+                const shard = network.mrenclave;
                 const result = await worker.trustedBalanceTransfer(
                     alice,
                     shard,
@@ -91,7 +90,7 @@ describe('worker', () => {
 
         describe('balance unshield should work', () => {
             it('should return value', async () => {
-                const shard = worker.createType('ShardIdentifier', bs58.decode(network.mrenclave));
+                const shard = network.mrenclave;
                 const result = await worker.balanceUnshieldFunds(
                     alice,
                     shard,

diff --git a/packages/worker-api/src/integriteeWorker.ts b/packages/worker-api/src/integriteeWorker.ts
@@ -15,6 +15,7 @@ import {callGetter, sendTrustedCall} from './sendRequest.js';
 import {createTrustedCall} from "./requests.js";
 import {PubKeyPinPair, toAccount} from "@encointer/util/common";
 import {Worker} from "./worker.js";
+import bs58 from "bs58";
 
 export class IntegriteeWorker extends Worker {
 
@@ -34,32 +35,34 @@ export class IntegriteeWorker extends Worker {
 
     public async trustedBalanceTransfer(
         accountOrPubKey: KeyringPair | PubKeyPinPair,
-        shard: ShardIdentifier,
+        shard: string,
         mrenclave: string,
         from: String,
         to: String,
         amount: number,
         options: CallOptions = {} as CallOptions
     ): Promise<Hash> {
         const nonce = await this.getNonce(accountOrPubKey, mrenclave, options);
+        const shardT = this.createType('ShardIdentifier', bs58.decode(shard));
         const params = this.createType('BalanceTransferArgs', [from, to, amount])
-        const call = createTrustedCall(this, ['balance_transfer', 'BalanceTransferArgs'], accountOrPubKey, shard, mrenclave, nonce, params);
-        return this.sendTrustedCall(call, shard, options);
+        const call = createTrustedCall(this, ['balance_transfer', 'BalanceTransferArgs'], accountOrPubKey, shardT, mrenclave, nonce, params);
+        return this.sendTrustedCall(call, shardT, options);
     }
 
     public async balanceUnshieldFunds(
         accountOrPubKey: KeyringPair | PubKeyPinPair,
-        shard: ShardIdentifier,
+        shard: string,
         mrenclave: string,
         fromIncognitoAddress: string,
         toPublicAddress: string,
         amount: number,
         options: CallOptions = {} as CallOptions
     ): Promise<Hash> {
         const nonce = await this.getNonce(accountOrPubKey, mrenclave, options);
-        const params = this.createType('BalanceUnshieldArgs', [fromIncognitoAddress, toPublicAddress, amount, shard])
-        const call = createTrustedCall(this, ['balance_unshield', 'BalanceUnshieldArgs'], accountOrPubKey, shard, mrenclave, nonce, params);
-        return this.sendTrustedCall(call, shard, options);
+        const shardT = this.createType('ShardIdentifier', bs58.decode(shard));
+        const params = this.createType('BalanceUnshieldArgs', [fromIncognitoAddress, toPublicAddress, amount, shardT])
+        const call = createTrustedCall(this, ['balance_unshield', 'BalanceUnshieldArgs'], accountOrPubKey, shardT, mrenclave, nonce, params);
+        return this.sendTrustedCall(call, shardT, options);
     }
 
     async sendTrustedCall(call: IntegriteeTrustedCallSigned, shard: ShardIdentifier, options: CallOptions = {} as CallOptions): Promise<Hash> {