@aeternity/aepp-sdk 12.1.3 → 13.0.0-alpha.1

package/src/apis/compiler/models/mappers.ts

@@ -28,12 +28,6 @@ export const CompileOpts: coreClient.CompositeMapper = {
     name: "Composite",
     className: "CompileOpts",
     modelProperties: {
-      backend: {
-        serializedName: "backend",
-        type: {
-          name: "String"
-        }
-      },
       fileSystem: {
         serializedName: "file_system",
         type: {
@@ -92,14 +86,8 @@ export const CompilerError: coreClient.CompositeMapper = {
     name: "Composite",
     className: "CompilerError",
     modelProperties: {
-      context: {
-        serializedName: "context",
-        type: {
-          name: "String"
-        }
-      },
-      message: {
-        serializedName: "message",
+      type: {
+        serializedName: "type",
         required: true,
         type: {
           name: "String"
@@ -112,12 +100,18 @@ export const CompilerError: coreClient.CompositeMapper = {
           className: "ErrorPos"
         }
       },
-      type: {
-        serializedName: "type",
+      message: {
+        serializedName: "message",
         required: true,
         type: {
           name: "String"
         }
+      },
+      context: {
+        serializedName: "context",
+        type: {
+          name: "String"
+        }
       }
     }
   }
@@ -128,13 +122,6 @@ export const ErrorPos: coreClient.CompositeMapper = {
     name: "Composite",
     className: "ErrorPos",
     modelProperties: {
-      col: {
-        serializedName: "col",
-        required: true,
-        type: {
-          name: "Number"
-        }
-      },
       file: {
         serializedName: "file",
         type: {
@@ -147,37 +134,12 @@ export const ErrorPos: coreClient.CompositeMapper = {
         type: {
           name: "Number"
         }
-      }
-    }
-  }
-};
-
-export const ErrorModel: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ErrorModel",
-    modelProperties: {
-      reason: {
-        serializedName: "reason",
-        required: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const APIVersion: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "APIVersion",
-    modelProperties: {
-      apiVersion: {
-        serializedName: "api-version",
+      },
+      col: {
+        serializedName: "col",
         required: true,
         type: {
-          name: "String"
+          name: "Number"
         }
       }
     }
@@ -200,55 +162,23 @@ export const ByteCode: coreClient.CompositeMapper = {
   }
 };
 
-export const ByteCodeInput: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "ByteCodeInput",
-    modelProperties: {
-      bytecode: {
-        serializedName: "bytecode",
-        required: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const CompilerVersion: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "CompilerVersion",
-    modelProperties: {
-      version: {
-        serializedName: "version",
-        required: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
 export const SophiaCallResultInput: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "SophiaCallResultInput",
     modelProperties: {
-      callResult: {
-        serializedName: "call-result",
+      source: {
+        serializedName: "source",
         required: true,
         type: {
           name: "String"
         }
       },
-      callValue: {
-        serializedName: "call-value",
-        required: true,
+      options: {
+        serializedName: "options",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "CompileOpts"
         }
       },
       function: {
@@ -258,15 +188,15 @@ export const SophiaCallResultInput: coreClient.CompositeMapper = {
           name: "String"
         }
       },
-      options: {
-        serializedName: "options",
+      callResult: {
+        serializedName: "call-result",
+        required: true,
         type: {
-          name: "Composite",
-          className: "CompileOpts"
+          name: "String"
         }
       },
-      source: {
-        serializedName: "source",
+      callValue: {
+        serializedName: "call-value",
         required: true,
         type: {
           name: "String"
@@ -281,14 +211,15 @@ export const BytecodeCallResultInput: coreClient.CompositeMapper = {
     name: "Composite",
     className: "BytecodeCallResultInput",
     modelProperties: {
-      backend: {
-        serializedName: "backend",
+      bytecode: {
+        serializedName: "bytecode",
+        required: true,
         type: {
           name: "String"
         }
       },
-      bytecode: {
-        serializedName: "bytecode",
+      function: {
+        serializedName: "function",
         required: true,
         type: {
           name: "String"
@@ -307,13 +238,6 @@ export const BytecodeCallResultInput: coreClient.CompositeMapper = {
         type: {
           name: "String"
         }
-      },
-      function: {
-        serializedName: "function",
-        required: true,
-        type: {
-          name: "String"
-        }
       }
     }
   }
@@ -343,24 +267,53 @@ export const DecodedCallresult: coreClient.CompositeMapper = {
   }
 };
 
-export const DecodeCalldataBytecode: coreClient.CompositeMapper = {
+export const FunctionCallInput: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "DecodeCalldataBytecode",
+    className: "FunctionCallInput",
     modelProperties: {
-      backend: {
-        serializedName: "backend",
+      source: {
+        serializedName: "source",
+        required: true,
         type: {
           name: "String"
         }
       },
-      bytecode: {
-        serializedName: "bytecode",
+      options: {
+        serializedName: "options",
+        type: {
+          name: "Composite",
+          className: "CompileOpts"
+        }
+      },
+      function: {
+        serializedName: "function",
         required: true,
         type: {
           name: "String"
         }
       },
+      arguments: {
+        serializedName: "arguments",
+        required: true,
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const Calldata: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "Calldata",
+    modelProperties: {
       calldata: {
         serializedName: "calldata",
         required: true,
@@ -372,11 +325,41 @@ export const DecodeCalldataBytecode: coreClient.CompositeMapper = {
   }
 };
 
+export const DecodeCalldataBytecode: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "DecodeCalldataBytecode",
+    modelProperties: {
+      calldata: {
+        serializedName: "calldata",
+        required: true,
+        type: {
+          name: "String"
+        }
+      },
+      bytecode: {
+        serializedName: "bytecode",
+        required: true,
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const DecodedCalldata: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DecodedCalldata",
     modelProperties: {
+      function: {
+        serializedName: "function",
+        required: true,
+        type: {
+          name: "String"
+        }
+      },
       arguments: {
         serializedName: "arguments",
         required: true,
@@ -389,9 +372,18 @@ export const DecodedCalldata: coreClient.CompositeMapper = {
             }
           }
         }
-      },
-      function: {
-        serializedName: "function",
+      }
+    }
+  }
+};
+
+export const ErrorModel: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "ErrorModel",
+    modelProperties: {
+      reason: {
+        serializedName: "reason",
         required: true,
         type: {
           name: "String"
@@ -406,15 +398,8 @@ export const DecodeCalldataSource: coreClient.CompositeMapper = {
     name: "Composite",
     className: "DecodeCalldataSource",
     modelProperties: {
-      calldata: {
-        serializedName: "calldata",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      function: {
-        serializedName: "function",
+      source: {
+        serializedName: "source",
         required: true,
         type: {
           name: "String"
@@ -427,8 +412,15 @@ export const DecodeCalldataSource: coreClient.CompositeMapper = {
           className: "CompileOpts"
         }
       },
-      source: {
-        serializedName: "source",
+      calldata: {
+        serializedName: "calldata",
+        required: true,
+        type: {
+          name: "String"
+        }
+      },
+      function: {
+        serializedName: "function",
         required: true,
         type: {
           name: "String"
@@ -438,20 +430,13 @@ export const DecodeCalldataSource: coreClient.CompositeMapper = {
   }
 };
 
-export const SophiaBinaryData: coreClient.CompositeMapper = {
+export const ByteCodeInput: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SophiaBinaryData",
+    className: "ByteCodeInput",
     modelProperties: {
-      data: {
-        serializedName: "data",
-        required: true,
-        type: {
-          name: "String"
-        }
-      },
-      sophiaType: {
-        serializedName: "sophia-type",
+      bytecode: {
+        serializedName: "bytecode",
         required: true,
         type: {
           name: "String"
@@ -461,42 +446,36 @@ export const SophiaBinaryData: coreClient.CompositeMapper = {
   }
 };
 
-export const SophiaJsonData: coreClient.CompositeMapper = {
+export const FateAssembler: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "SophiaJsonData",
+    className: "FateAssembler",
     modelProperties: {
-      data: {
-        serializedName: "data",
+      fateAssembler: {
+        serializedName: "fate-assembler",
         required: true,
         type: {
-          name: "Dictionary",
-          value: { type: { name: "any" } }
+          name: "String"
         }
       }
     }
   }
 };
 
-export const FunctionCallInput: coreClient.CompositeMapper = {
+export const ValidateByteCodeInput: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "FunctionCallInput",
+    className: "ValidateByteCodeInput",
     modelProperties: {
-      arguments: {
-        serializedName: "arguments",
+      bytecode: {
+        serializedName: "bytecode",
         required: true,
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      function: {
-        serializedName: "function",
+      source: {
+        serializedName: "source",
         required: true,
         type: {
           name: "String"
@@ -508,25 +487,18 @@ export const FunctionCallInput: coreClient.CompositeMapper = {
           name: "Composite",
           className: "CompileOpts"
         }
-      },
-      source: {
-        serializedName: "source",
-        required: true,
-        type: {
-          name: "String"
-        }
       }
     }
   }
 };
 
-export const Calldata: coreClient.CompositeMapper = {
+export const CompilerVersion: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "Calldata",
+    className: "CompilerVersion",
     modelProperties: {
-      calldata: {
-        serializedName: "calldata",
+      version: {
+        serializedName: "version",
         required: true,
         type: {
           name: "String"
@@ -536,13 +508,13 @@ export const Calldata: coreClient.CompositeMapper = {
   }
 };
 
-export const FateAssembler: coreClient.CompositeMapper = {
+export const ApiVersion: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "FateAssembler",
+    className: "ApiVersion",
     modelProperties: {
-      fateAssembler: {
-        serializedName: "fate-assembler",
+      apiVersion: {
+        serializedName: "api-version",
         required: true,
         type: {
           name: "String"
@@ -552,30 +524,40 @@ export const FateAssembler: coreClient.CompositeMapper = {
   }
 };
 
-export const ValidateByteCodeInput: coreClient.CompositeMapper = {
+export const SophiaBinaryData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ValidateByteCodeInput",
+    className: "SophiaBinaryData",
     modelProperties: {
-      bytecode: {
-        serializedName: "bytecode",
+      sophiaType: {
+        serializedName: "sophia-type",
         required: true,
         type: {
           name: "String"
         }
       },
-      options: {
-        serializedName: "options",
+      data: {
+        serializedName: "data",
+        required: true,
         type: {
-          name: "Composite",
-          className: "CompileOpts"
+          name: "String"
         }
-      },
-      source: {
-        serializedName: "source",
+      }
+    }
+  }
+};
+
+export const SophiaJsonData: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "SophiaJsonData",
+    modelProperties: {
+      data: {
+        serializedName: "data",
         required: true,
         type: {
-          name: "String"
+          name: "Dictionary",
+          value: { type: { name: "any" } }
         }
       }
     }

package/src/apis/compiler/models/parameters.ts

@@ -1,13 +1,12 @@
 import { OperationParameter, OperationURLParameter } from "@azure/core-client";
 import {
   Contract as ContractMapper,
-  ByteCodeInput as ByteCodeInputMapper,
   SophiaCallResultInput as SophiaCallResultInputMapper,
   BytecodeCallResultInput as BytecodeCallResultInputMapper,
+  FunctionCallInput as FunctionCallInputMapper,
   DecodeCalldataBytecode as DecodeCalldataBytecodeMapper,
   DecodeCalldataSource as DecodeCalldataSourceMapper,
-  SophiaBinaryData as SophiaBinaryDataMapper,
-  FunctionCallInput as FunctionCallInputMapper,
+  ByteCodeInput as ByteCodeInputMapper,
   ValidateByteCodeInput as ValidateByteCodeInputMapper
 } from "../models/mappers";
 
@@ -54,17 +53,17 @@ export const $host: OperationURLParameter = {
 
 export const body1: OperationParameter = {
   parameterPath: "body",
-  mapper: ByteCodeInputMapper
+  mapper: SophiaCallResultInputMapper
 };
 
 export const body2: OperationParameter = {
   parameterPath: "body",
-  mapper: SophiaCallResultInputMapper
+  mapper: BytecodeCallResultInputMapper
 };
 
 export const body3: OperationParameter = {
   parameterPath: "body",
-  mapper: BytecodeCallResultInputMapper
+  mapper: FunctionCallInputMapper
 };
 
 export const body4: OperationParameter = {
@@ -79,15 +78,10 @@ export const body5: OperationParameter = {
 
 export const body6: OperationParameter = {
   parameterPath: "body",
-  mapper: SophiaBinaryDataMapper
+  mapper: ByteCodeInputMapper
 };
 
 export const body7: OperationParameter = {
-  parameterPath: "body",
-  mapper: FunctionCallInputMapper
-};
-
-export const body8: OperationParameter = {
   parameterPath: "body",
   mapper: ValidateByteCodeInputMapper
 };

package/src/chain.ts

@@ -16,7 +16,7 @@
  */
 import { AE_AMOUNT_FORMATS, formatAmount } from './utils/amount-formatter';
 import verifyTransaction, { ValidatorResult } from './tx/validator';
-import { pause } from './utils/other';
+import { isAccountNotFoundError, pause } from './utils/other';
 import { isNameValid, produceNameId } from './tx/builder/helpers';
 import { DRY_RUN_ACCOUNT } from './tx/builder/schema';
 import { AensName } from './tx/builder/constants';
@@ -184,7 +184,7 @@ export async function sendTransaction(
   try {
     let __queue;
     try {
-      __queue = onAccount != null ? `tx-${await onAccount.address(options)}` : null;
+      __queue = onAccount != null ? `tx-${onAccount.address}` : null;
     } catch (error) {
       __queue = null;
     }
@@ -267,7 +267,10 @@ export async function getBalance(
   { format = AE_AMOUNT_FORMATS.AETTOS, ...options }:
   { format?: AE_AMOUNT_FORMATS } & Parameters<typeof getAccount>[1],
 ): Promise<string> {
-  const { balance } = await getAccount(address, options).catch(() => ({ balance: 0n }));
+  const { balance } = await getAccount(address, options).catch((error) => {
+    if (!isAccountNotFoundError(error)) throw error;
+    return { balance: 0n };
+  });
 
   return formatAmount(balance, { targetDenomination: format });
 }
@@ -350,7 +353,7 @@ export async function getMicroBlockHeader(
 interface TxDryRunArguments {
   tx: Encoded.Transaction;
   accountAddress: Encoded.AccountAddress;
-  top?: number;
+  top?: number | Encoded.KeyBlockHash | Encoded.MicroBlockHash;
   txEvents?: any;
   resolve: Function;
   reject: Function;
@@ -364,8 +367,10 @@ async function txDryRunHandler(key: string, onNode: Node): Promise<void> {
 
   let dryRunRes;
   try {
+    const top = typeof rs[0].top === 'number'
+      ? (await getKeyBlock(rs[0].top, { onNode })).hash : rs[0].top;
     dryRunRes = await onNode.protectedDryRunTxs({
-      top: rs[0].top,
+      top,
       txEvents: rs[0].txEvents,
       txs: rs.map((req) => ({ tx: req.tx })),
       accounts: Array.from(new Set(rs.map((req) => req.accountAddress)))
@@ -403,7 +408,7 @@ export async function txDryRun(
   {
     top, txEvents, combine, onNode,
   }:
-  { top?: number; txEvents?: boolean; combine?: boolean; onNode: Node },
+  { top?: TxDryRunArguments['top']; txEvents?: boolean; combine?: boolean; onNode: Node },
 ): Promise<{
     txEvents?: TransformNodeType<DryRunResults['txEvents']>;
   } & TransformNodeType<DryRunResult>> {