difftreelog
test ethContract group for eth-playgrounds
in: master
5 files changed
tests/package.jsondiffbeforeafterboth--- a/tests/package.json
+++ b/tests/package.json
@@ -30,6 +30,7 @@
"testEth": "mocha --timeout 9999999 -r ts-node/register './**/eth/**/*.test.ts'",
"testEthMarketplace": "mocha --timeout 9999999 -r ts-node/register './**/eth/marketplace/**/*.test.ts'",
"testEthNesting": "mocha --timeout 9999999 -r ts-node/register './**/eth/nesting/**/*.test.ts'",
+ "testEthPayable": "mocha --timeout 9999999 -r ts-node/register './**/eth/payable.test.ts'",
"load": "mocha --timeout 9999999 -r ts-node/register './**/*.load.ts'",
"loadTransfer": "ts-node src/transfer.nload.ts",
"testCollision": "mocha --timeout 9999999 -r ts-node/register ./src/collision-tests/*.test.ts",
tests/src/eth/payable.test.tsdiffbeforeafterboth--- a/tests/src/eth/payable.test.ts
+++ b/tests/src/eth/payable.test.ts
@@ -14,97 +14,91 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-import {expect} from 'chai';
-import {submitTransactionAsync} from '../substrate/substrate-api';
-import {createEthAccountWithBalance, deployCollector, GAS_ARGS, itWeb3, subToEth, transferBalanceToEth} from './util/helpers';
-import {evmToAddress} from '@polkadot/util-crypto';
-import {getGenericResult, UNIQUE} from '../util/helpers';
-import {getBalanceSingle, transferBalanceExpectSuccess} from '../substrate/get-balance';
+import {IKeyringPair} from '@polkadot/types/types';
+
+import {itEth, expect, usingEthPlaygrounds} from './util/playgrounds';
describe('EVM payable contracts', () => {
- itWeb3('Evm contract can receive wei from eth account', async ({api, web3, privateKeyWrapper}) => {
- const deployer = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const contract = await deployCollector(web3, deployer);
+ let donor: IKeyringPair;
- await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: '10000', ...GAS_ARGS});
+ before(async function() {
+ await usingEthPlaygrounds(async (helper, privateKey) => {
+ donor = privateKey('//Alice');
+ });
+ });
+
+ itEth('Evm contract can receive wei from eth account', async ({helper}) => {
+ const deployer = await helper.eth.createAccountWithBalance(donor);
+ const contract = await helper.eth.deployCollectorContract(deployer);
+
+ const web3 = helper.getWeb3();
+
+ await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: '10000', gas: helper.eth.DEFAULT_GAS});
expect(await contract.methods.getCollected().call()).to.be.equal('10000');
});
- itWeb3('Evm contract can receive wei from substrate account', async ({api, web3, privateKeyWrapper}) => {
- const deployer = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const contract = await deployCollector(web3, deployer);
- const alice = privateKeyWrapper('//Alice');
+ itEth('Evm contract can receive wei from substrate account', async ({helper}) => {
+ const deployer = await helper.eth.createAccountWithBalance(donor);
+ const contract = await helper.eth.deployCollectorContract(deployer);
+ const [alice] = await helper.arrange.createAccounts([10n], donor);
+
+ const weiCount = '10000';
// Transaction fee/value will be payed from subToEth(sender) evm balance,
// which is backed by evmToAddress(subToEth(sender)) substrate balance
- await transferBalanceToEth(api, alice, subToEth(alice.address));
+ await helper.eth.transferBalanceFromSubstrate(alice, helper.address.substrateToEth(alice.address), 5n);
+
- {
- const tx = api.tx.evm.call(
- subToEth(alice.address),
- contract.options.address,
- contract.methods.giveMoney().encodeABI(),
- '10000',
- GAS_ARGS.gas,
- await web3.eth.getGasPrice(),
- null,
- null,
- [],
- );
- const events = await submitTransactionAsync(alice, tx);
- const result = getGenericResult(events);
- expect(result.success).to.be.true;
- }
+ await helper.eth.callEVM(alice, contract.options.address, contract.methods.giveMoney().encodeABI(), weiCount);
- expect(await contract.methods.getCollected().call()).to.be.equal('10000');
+ expect(await contract.methods.getCollected().call()).to.be.equal(weiCount);
});
// We can't handle sending balance to backing storage of evm balance, because evmToAddress operation is irreversible
- itWeb3('Wei sent directly to backing storage of evm contract balance is unaccounted', async({api, web3, privateKeyWrapper}) => {
- const deployer = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const contract = await deployCollector(web3, deployer);
- const alice = privateKeyWrapper('//Alice');
+ itEth('Wei sent directly to backing storage of evm contract balance is unaccounted', async({helper}) => {
+ const deployer = await helper.eth.createAccountWithBalance(donor);
+ const contract = await helper.eth.deployCollectorContract(deployer);
+ const [alice] = await helper.arrange.createAccounts([10n], donor);
+
+ const weiCount = 10_000n;
- await transferBalanceExpectSuccess(api, alice, evmToAddress(contract.options.address), '10000');
+ await helper.eth.transferBalanceFromSubstrate(alice, contract.options.address, weiCount, false);
- expect(await contract.methods.getUnaccounted().call()).to.be.equal('10000');
+ expect(await contract.methods.getUnaccounted().call()).to.be.equal(weiCount.toString());
});
- itWeb3('Balance can be retrieved from evm contract', async({api, web3, privateKeyWrapper}) => {
- const FEE_BALANCE = 1000n * UNIQUE;
- const CONTRACT_BALANCE = 1n * UNIQUE;
+ itEth('Balance can be retrieved from evm contract', async({helper, privateKey}) => {
+ const FEE_BALANCE = 10n * helper.balance.getOneTokenNominal();
+ const CONTRACT_BALANCE = 1n * helper.balance.getOneTokenNominal();
+
+ const deployer = await helper.eth.createAccountWithBalance(donor);
+ const contract = await helper.eth.deployCollectorContract(deployer);
+ const [alice] = await helper.arrange.createAccounts([20n], donor);
- const deployer = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
- const contract = await deployCollector(web3, deployer);
- const alice = privateKeyWrapper('//Alice');
+ const web3 = helper.getWeb3();
- await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: CONTRACT_BALANCE.toString(), ...GAS_ARGS});
+ await web3.eth.sendTransaction({from: deployer, to: contract.options.address, value: CONTRACT_BALANCE.toString(), gas: helper.eth.DEFAULT_GAS});
- const receiver = privateKeyWrapper(`//Receiver${Date.now()}`);
+ const receiver = privateKey(`//Receiver${Date.now()}`);
// First receive balance on eth balance of bob
{
- const ethReceiver = subToEth(receiver.address);
+ const ethReceiver = helper.address.substrateToEth(receiver.address);
expect(await web3.eth.getBalance(ethReceiver)).to.be.equal('0');
await contract.methods.withdraw(ethReceiver).send({from: deployer});
expect(await web3.eth.getBalance(ethReceiver)).to.be.equal(CONTRACT_BALANCE.toString());
}
// Some balance is required to pay fee for evm.withdraw call
- await transferBalanceExpectSuccess(api, alice, receiver.address, FEE_BALANCE.toString());
+ await helper.balance.transferToSubstrate(alice, receiver.address, FEE_BALANCE);
+ // await transferBalanceExpectSuccess(api, alice, receiver.address, FEE_BALANCE.toString());
// Withdraw balance from eth to substrate
{
- const initialReceiverBalance = await getBalanceSingle(api, receiver.address);
- const tx = api.tx.evm.withdraw(
- subToEth(receiver.address),
- CONTRACT_BALANCE.toString(),
- );
- const events = await submitTransactionAsync(receiver, tx);
- const result = getGenericResult(events);
- expect(result.success).to.be.true;
- const finalReceiverBalance = await getBalanceSingle(api, receiver.address);
+ const initialReceiverBalance = await helper.balance.getSubstrate(receiver.address);
+ await helper.executeExtrinsic(receiver, 'api.tx.evm.withdraw', [helper.address.substrateToEth(receiver.address), CONTRACT_BALANCE.toString()], true);
+ const finalReceiverBalance = await helper.balance.getSubstrate(receiver.address);
expect(finalReceiverBalance > initialReceiverBalance).to.be.true;
}
tests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -0,0 +1,9 @@
+export interface ContractImports {
+ solPath: string;
+ fsPath: string;
+}
+
+export interface CompiledContract {
+ abi: any;
+ object: string;
+}
\ No newline at end of file
tests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034/* eslint-disable function-call-argument-newline */56import Web3 from 'web3';7import {WebsocketProvider} from 'web3-core';8import {Contract} from 'web3-eth-contract';910import {evmToAddress} from '@polkadot/util-crypto';11import {IKeyringPair} from '@polkadot/types/types';1213import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';1415// Native contracts ABI16import collectionHelpersAbi from '../../collectionHelpersAbi.json';17import fungibleAbi from '../../fungibleAbi.json';18import nonFungibleAbi from '../../nonFungibleAbi.json';19import refungibleAbi from '../../reFungibleAbi.json';20import refungibleTokenAbi from '../../reFungibleTokenAbi.json';21import contractHelpersAbi from './../contractHelpersAbi.json';2223class EthGroupBase {24 helper: EthUniqueHelper;2526 constructor(helper: EthUniqueHelper) {27 this.helper = helper;28 }29}30 31 32class NativeContractGroup extends EthGroupBase {33 DEFAULT_GAS = 2_500_000;3435 contractHelpers(caller: string): Contract {36 const web3 = this.helper.getWeb3();37 return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, gas: this.DEFAULT_GAS});38 }3940 collectionHelpers(caller: string) {41 const web3 = this.helper.getWeb3();42 return new web3.eth.Contract(collectionHelpersAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, gas: this.DEFAULT_GAS});43 }4445 collection(address: string, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {46 const abi = {47 'nft': nonFungibleAbi,48 'rft': refungibleAbi,49 'ft': fungibleAbi50 }[mode];51 const web3 = this.helper.getWeb3();52 return new web3.eth.Contract(abi as any, address, {gas: this.DEFAULT_GAS, ...(caller ? {from: caller} : {})});53 }5455 rftTokenByAddress(address: string, caller?: string): Contract {56 const web3 = this.helper.getWeb3();57 return new web3.eth.Contract(refungibleTokenAbi as any, address, {gas: this.DEFAULT_GAS, ...(caller ? {from: caller} : {})});58 }5960 rftToken(collectionId: number, tokenId: number, caller?: string): Contract {61 return this.rftTokenByAddress(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);62 }63}6465 66class EthGroup extends EthGroupBase {67 createAccount() {68 const web3 = this.helper.getWeb3();69 const account = web3.eth.accounts.create();70 web3.eth.accounts.wallet.add(account.privateKey);71 return account.address;72 }7374 async createAccountWithBalance(donor: IKeyringPair, amount=1000n) {75 const account = this.createAccount();76 await this.transferBalanceFromSubstrate(donor, account, amount);77 78 return account;79 }8081 async transferBalanceFromSubstrate(donor: IKeyringPair, recepient: string, amount=1000n) {82 return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * this.helper.balance.getOneTokenNominal());83 }8485 async createNonfungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {86 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);87 88 const result = await collectionHelper.methods.createNonfungibleCollection(name, description, tokenPrefix).send();8990 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);91 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);9293 return {collectionId, collectionAddress};94 }95}96 97 98class EthAddressGroup extends EthGroupBase {99 extractCollectionId(address: string): number {100 if (!(address.length === 42 || address.length === 40)) throw new Error('address wrong format');101 return parseInt(address.substr(address.length - 8), 16);102 }103104 fromCollectionId(collectionId: number): string {105 if (collectionId >= 0xffffffff || collectionId < 0) throw new Error('collectionId overflow');106 return Web3.utils.toChecksumAddress(`0x17c4e6453cc49aaaaeaca894e6d9683e${collectionId.toString(16).padStart(8,'0')}`);107 }108109 extractTokenId(address: string): {collectionId: number, tokenId: number} {110 if (!address.startsWith('0x'))111 throw 'address not starts with "0x"';112 if (address.length > 42)113 throw 'address length is more than 20 bytes';114 return {115 collectionId: Number('0x' + address.substring(address.length - 16, address.length - 8)),116 tokenId: Number('0x' + address.substring(address.length - 8)),117 };118 }119120 fromTokenId(collectionId: number, tokenId: number): string {121 return this.helper.util.getNestingTokenAddress(collectionId, tokenId);122 }123124 normalizeAddress(address: string): string {125 return '0x' + address.substring(address.length - 40);126 }127} 128 129130export class EthUniqueHelper extends DevUniqueHelper {131 web3: Web3 | null = null;132 web3Provider: WebsocketProvider | null = null;133134 eth: EthGroup;135 ethAddress: EthAddressGroup;136 ethNativeContract: NativeContractGroup;137138 constructor(logger: { log: (msg: any, level: any) => void, level: any }) {139 super(logger);140 this.eth = new EthGroup(this);141 this.ethAddress = new EthAddressGroup(this);142 this.ethNativeContract = new NativeContractGroup(this);143 }144145 getWeb3(): Web3 {146 if(this.web3 === null) throw Error('Web3 not connected');147 return this.web3;148 }149150 async connectWeb3(wsEndpoint: string) {151 if(this.web3 !== null) return;152 this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);153 this.web3 = new Web3(this.web3Provider);154 }155156 async disconnectWeb3() {157 if(this.web3 === null) return;158 this.web3Provider?.connection.close();159 this.web3 = null;160 }161}162 1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034/* eslint-disable function-call-argument-newline */56import {readFile} from 'fs/promises';78import Web3 from 'web3';9import {WebsocketProvider} from 'web3-core';10import {Contract} from 'web3-eth-contract';1112import * as solc from 'solc';1314import {evmToAddress} from '@polkadot/util-crypto';15import {IKeyringPair} from '@polkadot/types/types';1617import {DevUniqueHelper} from '../../../util/playgrounds/unique.dev';1819import {ContractImports, CompiledContract} from './types';2021// Native contracts ABI22import collectionHelpersAbi from '../../collectionHelpersAbi.json';23import fungibleAbi from '../../fungibleAbi.json';24import nonFungibleAbi from '../../nonFungibleAbi.json';25import refungibleAbi from '../../reFungibleAbi.json';26import refungibleTokenAbi from '../../reFungibleTokenAbi.json';27import contractHelpersAbi from './../contractHelpersAbi.json';2829class EthGroupBase {30 helper: EthUniqueHelper;3132 constructor(helper: EthUniqueHelper) {33 this.helper = helper;34 }35}363738class ContractGroup extends EthGroupBase {39 async findImports(imports?: ContractImports[]){40 if(!imports) return function(path: string) {41 return {error: 'File not found'};42 };43 44 const knownImports = {} as any;45 for(let imp of imports) {46 knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();47 }48 49 return function(path: string) {50 if(knownImports.hasOwnProperty(path)) return {contents: knownImports[path]};51 return {error: 'File not found'};52 }53 }5455 async compile(name: string, src: string, imports?: ContractImports[]): Promise<CompiledContract> {56 const out = JSON.parse(solc.compile(JSON.stringify({57 language: 'Solidity',58 sources: {59 [`${name}.sol`]: {60 content: src,61 },62 },63 settings: {64 outputSelection: {65 '*': {66 '*': ['*'],67 },68 },69 },70 }), {import: await this.findImports(imports)})).contracts[`${name}.sol`][name];71 72 return {73 abi: out.abi,74 object: '0x' + out.evm.bytecode.object,75 };76 }7778 async deployByCode(signer: string, name: string, src: string, imports?: ContractImports[]): Promise<Contract> {79 const compiledContract = await this.compile(name, src, imports);80 return this.deployByAbi(signer, compiledContract.abi, compiledContract.object);81 }8283 async deployByAbi(signer: string, abi: any, object: string): Promise<Contract> {84 const web3 = this.helper.getWeb3();85 const contract = new web3.eth.Contract(abi, undefined, {86 data: object,87 from: signer,88 gas: this.helper.eth.DEFAULT_GAS89 });90 return await contract.deploy({data: object}).send({from: signer});91 }9293}94 95class NativeContractGroup extends EthGroupBase {9697 contractHelpers(caller: string): Contract {98 const web3 = this.helper.getWeb3();99 return new web3.eth.Contract(contractHelpersAbi as any, '0x842899ECF380553E8a4de75bF534cdf6fBF64049', {from: caller, gas: this.helper.eth.DEFAULT_GAS});100 }101102 collectionHelpers(caller: string) {103 const web3 = this.helper.getWeb3();104 return new web3.eth.Contract(collectionHelpersAbi as any, '0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f', {from: caller, gas: this.helper.eth.DEFAULT_GAS});105 }106107 collection(address: string, mode: 'nft' | 'rft' | 'ft', caller?: string): Contract {108 const abi = {109 'nft': nonFungibleAbi,110 'rft': refungibleAbi,111 'ft': fungibleAbi112 }[mode];113 const web3 = this.helper.getWeb3();114 return new web3.eth.Contract(abi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});115 }116117 rftTokenByAddress(address: string, caller?: string): Contract {118 const web3 = this.helper.getWeb3();119 return new web3.eth.Contract(refungibleTokenAbi as any, address, {gas: this.helper.eth.DEFAULT_GAS, ...(caller ? {from: caller} : {})});120 }121122 rftToken(collectionId: number, tokenId: number, caller?: string): Contract {123 return this.rftTokenByAddress(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);124 }125}126127 128class EthGroup extends EthGroupBase {129 DEFAULT_GAS = 2_500_000;130131 createAccount() {132 const web3 = this.helper.getWeb3();133 const account = web3.eth.accounts.create();134 web3.eth.accounts.wallet.add(account.privateKey);135 return account.address;136 }137138 async createAccountWithBalance(donor: IKeyringPair, amount=1000n) {139 const account = this.createAccount();140 await this.transferBalanceFromSubstrate(donor, account, amount);141 142 return account;143 }144145 async transferBalanceFromSubstrate(donor: IKeyringPair, recepient: string, amount=1000n, inTokens=true) {146 return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * (inTokens ? this.helper.balance.getOneTokenNominal() : 1n));147 }148149 async callEVM(signer: IKeyringPair, contractAddress: string, abi: any, value: string, gasLimit?: number) {150 if(!gasLimit) gasLimit = this.DEFAULT_GAS;151 const web3 = this.helper.getWeb3();152 const gasPrice = await web3.eth.getGasPrice();153 // TODO: check execution status154 await this.helper.executeExtrinsic(155 signer,156 'api.tx.evm.call', [this.helper.address.substrateToEth(signer.address), contractAddress, abi, value, gasLimit, gasPrice, null, null, []],157 true, `Unable to perform evm.call`158 );159 }160161 async createNonfungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {162 const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);163 164 const result = await collectionHelper.methods.createNonfungibleCollection(name, description, tokenPrefix).send();165166 const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);167 const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);168169 return {collectionId, collectionAddress};170 }171172 async deployCollectorContract(signer: string): Promise<Contract> {173 return await this.helper.ethContract.deployByCode(signer, 'Collector', `174 // SPDX-License-Identifier: UNLICENSED175 pragma solidity ^0.8.6;176177 contract Collector {178 uint256 collected;179 fallback() external payable {180 giveMoney();181 }182 function giveMoney() public payable {183 collected += msg.value;184 }185 function getCollected() public view returns (uint256) {186 return collected;187 }188 function getUnaccounted() public view returns (uint256) {189 return address(this).balance - collected;190 }191192 function withdraw(address payable target) public {193 target.transfer(collected);194 collected = 0;195 }196 }197 `);198 }199}200 201 202class EthAddressGroup extends EthGroupBase {203 extractCollectionId(address: string): number {204 if (!(address.length === 42 || address.length === 40)) throw new Error('address wrong format');205 return parseInt(address.substr(address.length - 8), 16);206 }207208 fromCollectionId(collectionId: number): string {209 if (collectionId >= 0xffffffff || collectionId < 0) throw new Error('collectionId overflow');210 return Web3.utils.toChecksumAddress(`0x17c4e6453cc49aaaaeaca894e6d9683e${collectionId.toString(16).padStart(8,'0')}`);211 }212213 extractTokenId(address: string): {collectionId: number, tokenId: number} {214 if (!address.startsWith('0x'))215 throw 'address not starts with "0x"';216 if (address.length > 42)217 throw 'address length is more than 20 bytes';218 return {219 collectionId: Number('0x' + address.substring(address.length - 16, address.length - 8)),220 tokenId: Number('0x' + address.substring(address.length - 8)),221 };222 }223224 fromTokenId(collectionId: number, tokenId: number): string {225 return this.helper.util.getNestingTokenAddress(collectionId, tokenId);226 }227228 normalizeAddress(address: string): string {229 return '0x' + address.substring(address.length - 40);230 }231} 232 233234export class EthUniqueHelper extends DevUniqueHelper {235 web3: Web3 | null = null;236 web3Provider: WebsocketProvider | null = null;237238 eth: EthGroup;239 ethAddress: EthAddressGroup;240 ethNativeContract: NativeContractGroup;241 ethContract: ContractGroup;242243 constructor(logger: { log: (msg: any, level: any) => void, level: any }) {244 super(logger);245 this.eth = new EthGroup(this);246 this.ethAddress = new EthAddressGroup(this);247 this.ethNativeContract = new NativeContractGroup(this);248 this.ethContract = new ContractGroup(this);249 }250251 getWeb3(): Web3 {252 if(this.web3 === null) throw Error('Web3 not connected');253 return this.web3;254 }255256 async connectWeb3(wsEndpoint: string) {257 if(this.web3 !== null) return;258 this.web3Provider = new Web3.providers.WebsocketProvider(wsEndpoint);259 this.web3 = new Web3(this.web3Provider);260 }261262 async disconnectWeb3() {263 if(this.web3 === null) return;264 this.web3Provider?.connection.close();265 this.web3 = null;266 }267}268 tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -388,6 +388,7 @@
type: this.chainLogType.EXTRINSIC,
status: result.status,
call: extrinsic,
+ signer: this.getSignerAddress(sender),
params,
} as IUniqueHelperLog;