fix(sdk-coin-dot): make controller optional for bond call

EA-1060 EA-1176
BitGo · Aug 14, 2023 · a6f6a0d · a6f6a0d
1 parent 902558a
commit a6f6a0d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/modules/sdk-coin-dot/src/lib/batchTransactionBuilder.ts b/modules/sdk-coin-dot/src/lib/batchTransactionBuilder.ts
@@ -211,7 +211,8 @@ export class BatchTransactionBuilder extends TransactionBuilder {
     const baseTxInfo = this.createBaseTxInfo();
     const unsigned = methods.staking.bond(
       {
-        controller: args.controller.id,
+        // TODO(EA-1242): update DOT library to remove controller optional field -> https://github.com/paritytech/txwrapper-core/pull/309 and https://github.com/paritytech/substrate/pull/14039
+        controller: args.controller?.id || '',
         value: args.value,
         payee: this.getPayee(args.payee),
       },

diff --git a/modules/sdk-coin-dot/src/lib/iface.ts b/modules/sdk-coin-dot/src/lib/iface.ts
@@ -179,7 +179,7 @@ export type StakeArgsPayeeRaw = { controller?: null; stash?: null; staked?: null
  */
 export interface StakeArgs {
   value: string;
-  controller: { id: string };
+  controller?: { id: string };
   payee: StakeArgsPayee;
 }
 
@@ -275,7 +275,7 @@ export type StakeBatchCallPayee =
 
 export interface StakeBatchCallArgs {
   value: string;
-  controller: { id: string };
+  controller?: { id: string };
   payee: StakeBatchCallPayee;
 }
 

diff --git a/modules/sdk-coin-dot/src/lib/stakingBuilder.ts b/modules/sdk-coin-dot/src/lib/stakingBuilder.ts
@@ -125,7 +125,7 @@ export class StakingBuilder extends TransactionBuilder {
     if (decodedTxn.method?.name === MethodNames.Bond) {
       const txMethod = decodedTxn.method.args as unknown as StakeArgs;
       const value = txMethod.value;
-      const controller = txMethod.controller.id;
+      const controller = txMethod.controller?.id;
       const payee = txMethod.payee;
       const validationResult = StakeTransactionSchema.validate({ value, controller, payee });
       if (validationResult.error) {
@@ -150,7 +150,7 @@ export class StakingBuilder extends TransactionBuilder {
       console.log('[Dot staking debug] calling owner: ', JSON.stringify(txMethod));
       this.owner({
         address: utils.decodeDotAddress(
-          txMethod.controller.id,
+          txMethod.controller?.id || '',
           utils.getAddressFormat(this._coinConfig.name as DotAssetTypes)
         ),
       });

diff --git a/modules/sdk-coin-dot/src/lib/transaction.ts b/modules/sdk-coin-dot/src/lib/transaction.ts
@@ -216,7 +216,9 @@ export class Transaction extends BaseTransaction {
       const txMethod = decodedTx.method.args;
       if (utils.isBond(txMethod)) {
         const keypair = new KeyPair({
-          pub: Buffer.from(decodeAddress(txMethod.controller.id, false, this._registry.chainSS58)).toString('hex'),
+          pub: Buffer.from(decodeAddress(txMethod.controller?.id || '', false, this._registry.chainSS58)).toString(
+            'hex'
+          ),
         });
 
         result.controller = keypair.getAddress(utils.getAddressFormat(this._coinConfig.name as DotAssetTypes));

diff --git a/modules/sdk-coin-dot/src/lib/txnSchema.ts b/modules/sdk-coin-dot/src/lib/txnSchema.ts
@@ -52,7 +52,7 @@ export const TransferAllTransactionSchema = joi.object({
 
 const CreateStakeTransactionSchema = joi.object({
   value: joi.string().required(),
-  controller: addressSchema.required(),
+  controller: joi.string().optional(),
   payee: [
     joi.string(),
     joi.object({