diff --git a/docs/examples/promise/09_transfer_events/index.js b/docs/examples/promise/09_transfer_events/index.js index 49e3698a93..0b84df9894 100755 --- a/docs/examples/promise/09_transfer_events/index.js +++ b/docs/examples/promise/09_transfer_events/index.js @@ -28,9 +28,9 @@ async function main () { const alicePair = keyring.getPair(ALICE); // create a new random recipient - const recipient = keyring.addFromSeed(randomAsU8a(32)).address(); + const recipient = keyring.addFromSeed(randomAsU8a(32)).address; - console.log('Sending', AMOUNT, 'from', alicePair.address(), 'to', recipient, 'with nonce', nonce.toString()); + console.log('Sending', AMOUNT, 'from', alicePair.address, 'to', recipient, 'with nonce', nonce.toString()); // Do the transfer and track the actual status api.tx.balances diff --git a/docs/examples/rx/09_transfer_events/index.js b/docs/examples/rx/09_transfer_events/index.js index 4df8a1cdf0..9291995f4b 100644 --- a/docs/examples/rx/09_transfer_events/index.js +++ b/docs/examples/rx/09_transfer_events/index.js @@ -24,9 +24,9 @@ async function main () { const alicePair = keyring.getPair(ALICE); // create a new random recipient - const recipient = keyring.addFromSeed(randomAsU8a(32)).address(); + const recipient = keyring.addFromSeed(randomAsU8a(32)).address; - console.log('Sending', AMOUNT, 'from', alicePair.address(), 'to', recipient); + console.log('Sending', AMOUNT, 'from', alicePair.address, 'to', recipient); // get the nonce for the admin key // Create a extrinsic, transferring 12345 units to Bob. diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 64575fdd7d..9f665d0a34 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -34,6 +34,6 @@ "memoizee": "^0.4.14" }, "devDependencies": { - "@polkadot/keyring": "^0.93.0-beta.3" + "@polkadot/keyring": "^0.93.0-beta.4" } } diff --git a/packages/api/package.json b/packages/api/package.json index 2aea7d40f1..4ba2924a55 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -33,9 +33,9 @@ "@polkadot/rpc-rx": "^0.81.0-beta.11", "@polkadot/storage": "^0.81.0-beta.11", "@polkadot/types": "^0.81.0-beta.11", - "@polkadot/util-crypto": "^0.93.0-beta.3" + "@polkadot/util-crypto": "^0.93.0-beta.4" }, "devDependencies": { - "@polkadot/keyring": "^0.93.0-beta.3" + "@polkadot/keyring": "^0.93.0-beta.4" } } diff --git a/packages/api/src/SubmittableExtrinsic.ts b/packages/api/src/SubmittableExtrinsic.ts index 78849f4a00..87b8181cc6 100644 --- a/packages/api/src/SubmittableExtrinsic.ts +++ b/packages/api/src/SubmittableExtrinsic.ts @@ -180,7 +180,7 @@ export default function createSubmittableExtrinsic { console.log('transfer status:', status.type); diff --git a/packages/api/src/promise/Api.ts b/packages/api/src/promise/Api.ts index eab64bd52c..4afbf3f30c 100644 --- a/packages/api/src/promise/Api.ts +++ b/packages/api/src/promise/Api.ts @@ -82,11 +82,11 @@ import Combinator, { CombinatorCallback, CombinatorFunction } from './Combinator * import ApiPromise from '@polkadot/api/promise'; * * ApiPromise.create().then((api) => { - * const nonce = await api.query.system.accountNonce(keyring.alice.address()); + * const nonce = await api.query.system.accountNonce(keyring.alice.address); * * api.tx.balances * // create transfer - * transfer(keyring.bob.address(), 12345) + * transfer(keyring.bob.address, 12345) * // sign the transcation * .sign(keyring.alice, { nonce }) * // send the transaction (optional status callback) diff --git a/packages/api/src/rx/Api.ts b/packages/api/src/rx/Api.ts index e465576e01..95840467a2 100644 --- a/packages/api/src/rx/Api.ts +++ b/packages/api/src/rx/Api.ts @@ -89,14 +89,14 @@ import ApiBase from '../Base'; * * // retrieve nonce for the account * api.query.system - * .accountNonce(keyring.alice.address()) + * .accountNonce(keyring.alice.address) * .pipe( * first(), * // pipe nonce into transfer * switchMap((nonce) => * api.tx.balances * // create transfer - * .transfer(keyring.bob.address(), 12345) + * .transfer(keyring.bob.address, 12345) * // sign the transcation * .sign(keyring.alice, { nonce }) * // send the transaction diff --git a/packages/api/test/e2e/promise-queries.spec.ts b/packages/api/test/e2e/promise-queries.spec.ts index d5d832f38b..7ec0d9e87f 100644 --- a/packages/api/test/e2e/promise-queries.spec.ts +++ b/packages/api/test/e2e/promise-queries.spec.ts @@ -42,7 +42,7 @@ describe.skip('Promise e2e queries', () => { it('queries state for a balance', async () => { return ( - api.query.balances.freeBalance(keyring.alice.address(), (balance) => { + api.query.balances.freeBalance(keyring.alice.address, (balance) => { expect(balance).toBeInstanceOf(BN); expect(balance.isZero()).toBe(false); }) @@ -81,7 +81,7 @@ describe.skip('Promise e2e queries', () => { it('subscribes to queries', (done) => { return ( - api.query.system.accountNonce(keyring.ferdie.address(), (nonce) => { + api.query.system.accountNonce(keyring.ferdie.address, (nonce) => { expect(nonce instanceof BN).toBe(true); done(); @@ -91,7 +91,7 @@ describe.skip('Promise e2e queries', () => { it.skip('subscribes to queries (default)', (done) => { return ( - api.query.staking.validators(keyring.ferdie.address(), (prefs) => { + api.query.staking.validators(keyring.ferdie.address, (prefs) => { expect(prefs.unstakeThreshold.toNumber()).toBe(3); done(); @@ -112,10 +112,10 @@ describe.skip('Promise e2e queries', () => { it('subscribes to multiple results (freeBalance.multi)', (done) => { return ( api.query.balances.freeBalance.multi([ - keyring.alice.address(), - keyring.bob.address(), + keyring.alice.address, + keyring.bob.address, '5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y', - keyring.ferdie.address() + keyring.ferdie.address ], (balances) => { expect(balances).toHaveLength(4); @@ -126,10 +126,10 @@ describe.skip('Promise e2e queries', () => { it('subscribes to multiple results (api.queryMulti)', (done) => { return api.queryMulti([ - [api.query.balances.freeBalance, keyring.alice.address()], - [api.query.balances.freeBalance, keyring.bob.address()], + [api.query.balances.freeBalance, keyring.alice.address], + [api.query.balances.freeBalance, keyring.bob.address], [api.query.balances.freeBalance, '5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y'], - [api.query.balances.freeBalance, keyring.ferdie.address()] + [api.query.balances.freeBalance, keyring.ferdie.address] ], (balances: Array) => { expect(balances).toHaveLength(4); @@ -140,9 +140,9 @@ describe.skip('Promise e2e queries', () => { it('subscribes to derived balances (balances.all)', (done) => { return ( api.derive.balances.all( - keyring.alice.address(), + keyring.alice.address, (all) => { - expect(all.accountId.toString()).toEqual(keyring.alice.address()); + expect(all.accountId.toString()).toEqual(keyring.alice.address); expect(all.freeBalance).toBeDefined(); expect(all.freeBalance.gt(ZERO)).toBe(true); @@ -229,16 +229,16 @@ describe.skip('Promise e2e queries', () => { describe('with map type', () => { it('queries correct value', async () => { - const balance = await api.query.balances.freeBalance(keyring.alice.address()) as Balance; + const balance = await api.query.balances.freeBalance(keyring.alice.address) as Balance; expect(balance.isZero()).toBe(false); }); it('queries correct value at a specified block', async () => { // assume the account Alice is only used in test(the balance of Alice does not change in this test case) - const balance = await api.query.balances.freeBalance(keyring.alice.address()); + const balance = await api.query.balances.freeBalance(keyring.alice.address); const header = await api.rpc.chain.getHeader() as Header; - const balanceAt = await api.query.balances.freeBalance.at(header.hash, keyring.alice.address()) as Balance; + const balanceAt = await api.query.balances.freeBalance.at(header.hash, keyring.alice.address) as Balance; expect(balanceAt.isZero()).toBe(false); expect(balanceAt.toString()).toEqual(balance.toString()); @@ -246,9 +246,9 @@ describe.skip('Promise e2e queries', () => { it('subscribes to query and get correct result', async (done) => { // assume the account Alice is only used in test(the balance of Alice does not change in this test case) - const balance = await api.query.balances.freeBalance(keyring.alice.address()); + const balance = await api.query.balances.freeBalance(keyring.alice.address); - return api.query.balances.freeBalance(keyring.alice.address(), (balanceSubscribed) => { + return api.query.balances.freeBalance(keyring.alice.address, (balanceSubscribed) => { expect(balanceSubscribed.isZero()).toBe(false); expect(balanceSubscribed.toString()).toEqual(balance.toString()); done(); @@ -256,18 +256,18 @@ describe.skip('Promise e2e queries', () => { }); it('queries correct hash', async () => { - const hash = await api.query.balances.freeBalance.hash(keyring.alice.address()); + const hash = await api.query.balances.freeBalance.hash(keyring.alice.address); expect(hash).toBeDefined(); }); it('gets correct key', async () => { // assume the account Alice is only used in test(the balance of Alice does not change in this test case) - const key = api.query.balances.freeBalance.key(keyring.alice.address()); + const key = api.query.balances.freeBalance.key(keyring.alice.address); const balanceData = await api.rpc.state.getStorage(key) as Option; const balanceRPC = new Balance(balanceData.unwrapOr(undefined)); - const balance = await api.query.balances.freeBalance(keyring.alice.address()); + const balance = await api.query.balances.freeBalance(keyring.alice.address); expect(balanceRPC.isZero()).toBe(false); expect(balanceRPC.toString()).toEqual(balance.toString()); @@ -275,12 +275,12 @@ describe.skip('Promise e2e queries', () => { it('queries multiple results', async () => { // assume the account Alice and Bob are only used in test(the balance of them do not change in this test case) - const balanceAlice = await api.query.balances.freeBalance(keyring.alice.address()); - const balanceBob = await api.query.balances.freeBalance(keyring.bob.address()); + const balanceAlice = await api.query.balances.freeBalance(keyring.alice.address); + const balanceBob = await api.query.balances.freeBalance(keyring.bob.address); const balances = await api.query.balances.freeBalance.multi([ - keyring.alice.address(), - keyring.bob.address() + keyring.alice.address, + keyring.bob.address ]); expect(balances).toHaveLength(2); @@ -290,12 +290,12 @@ describe.skip('Promise e2e queries', () => { it('subscribes to multiple queries and get correct results', async (done) => { // assume the account Alice and Bob are only used in test(the balance of them do not change in this test case) - const balanceAlice = await api.query.balances.freeBalance(keyring.alice.address()); - const balanceBob = await api.query.balances.freeBalance(keyring.bob.address()); + const balanceAlice = await api.query.balances.freeBalance(keyring.alice.address); + const balanceBob = await api.query.balances.freeBalance(keyring.bob.address); return api.query.balances.freeBalance.multi([ - keyring.alice.address(), - keyring.bob.address() + keyring.alice.address, + keyring.bob.address ], (balances) => { expect(balances).toHaveLength(2); expect(balances[0].toString()).toEqual(balanceAlice.toString()); @@ -305,7 +305,7 @@ describe.skip('Promise e2e queries', () => { }); it('queries correct size', async () => { - const size = await api.query.balances.freeBalance.size(keyring.alice.address()); + const size = await api.query.balances.freeBalance.size(keyring.alice.address); expect(size.toNumber()).not.toEqual(0); }); diff --git a/packages/api/test/e2e/promise-tx.spec.ts b/packages/api/test/e2e/promise-tx.spec.ts index dd750545f2..36e30b2a64 100644 --- a/packages/api/test/e2e/promise-tx.spec.ts +++ b/packages/api/test/e2e/promise-tx.spec.ts @@ -52,9 +52,9 @@ describe.skip('Promise e2e transactions', () => { }); it('can submit an extrinsic from hex', async (done) => { - const nonce = await api.query.system.accountNonce(keyring.dave.address()) as Index; + const nonce = await api.query.system.accountNonce(keyring.dave.address) as Index; const hex = api.tx.balances - .transfer(keyring.eve.address(), 12345) + .transfer(keyring.eve.address, 12345) .sign(keyring.dave, { nonce }) .toHex(); @@ -62,26 +62,26 @@ describe.skip('Promise e2e transactions', () => { }); it('makes a transfer (sign, then send)', async (done) => { - const nonce = await api.query.system.accountNonce(keyring.dave.address()) as Index; + const nonce = await api.query.system.accountNonce(keyring.dave.address) as Index; return api.tx.balances - .transfer(keyring.eve.address(), 12345) + .transfer(keyring.eve.address, 12345) .sign(keyring.dave, { nonce }) .send(logEvents(done)); }); it('makes a transfer (sign, then send - compat version)', async (done) => { - const nonce = await api.query.system.accountNonce(keyring.dave.address()) as Index; + const nonce = await api.query.system.accountNonce(keyring.dave.address) as Index; return api.tx.balances - .transfer(keyring.eve.address(), 12345) + .transfer(keyring.eve.address, 12345) .sign(keyring.dave, { nonce }) .send(logEvents(done)); }); it('makes a transfer (signAndSend)', async (done) => { return api.tx.balances - .transfer(keyring.eve.address(), 12345) + .transfer(keyring.eve.address, 12345) .signAndSend(keyring.dave, logEvents(done)); }); @@ -91,8 +91,8 @@ describe.skip('Promise e2e transactions', () => { api.setSigner(signer); return api.tx.balances - .transfer(keyring.eve.address(), 12345) - .signAndSend(keyring.dave.address(), logEvents(done)); + .transfer(keyring.eve.address, 12345) + .signAndSend(keyring.dave.address, logEvents(done)); }); it('makes a transfer (signAndSend via Signer) with undefined Signer', async () => { @@ -101,8 +101,8 @@ describe.skip('Promise e2e transactions', () => { api.setSigner(signer); await expect(api.tx.balances - .transfer(keyring.eve.address(), 12345) - .signAndSend(keyring.alice.address())).rejects.toThrow('no signer exists'); + .transfer(keyring.eve.address, 12345) + .signAndSend(keyring.alice.address)).rejects.toThrow('no signer exists'); }); it('makes a transfer (signAndSend via Signer) with the wrong keyring pair', async () => { @@ -112,20 +112,20 @@ describe.skip('Promise e2e transactions', () => { // no callback await expect(api.tx.balances - .transfer(keyring.eve.address(), 12345) - .signAndSend(keyring.alice.address())).rejects.toThrow('does not have the keyringPair'); + .transfer(keyring.eve.address, 12345) + .signAndSend(keyring.alice.address)).rejects.toThrow('does not have the keyringPair'); }); it('makes a transfer (signAndSend via Signer) with the wrong keyring pair with a callback', async () => { // with callback await expect(api.tx.balances - .transfer(keyring.eve.address(), 12345) - .signAndSend(keyring.alice.address(), (cb: any) => { /*do nothing */ })).rejects.toThrow('does not have the keyringPair'); + .transfer(keyring.eve.address, 12345) + .signAndSend(keyring.alice.address, (cb: any) => { /*do nothing */ })).rejects.toThrow('does not have the keyringPair'); }); it('makes a transfer (no callback)', async () => { const hash = await api.tx.balances - .transfer(keyring.eve.address(), 12345) + .transfer(keyring.eve.address, 12345) .signAndSend(keyring.dave); expect(hash.toHex()).toHaveLength(66); @@ -146,13 +146,13 @@ describe.skip('Promise e2e transactions', () => { function doOne (cb: any) { return api.tx.balances - .transfer(pair.address(), 123456) + .transfer(pair.address, 123456) .signAndSend(keyring.dave, logEvents(cb)); } function doTwo (cb: any) { return api.tx.balances - .transfer(keyring.alice.address(), 12345) + .transfer(keyring.alice.address, 12345) .signAndSend(pair, logEvents(cb)); } @@ -163,7 +163,7 @@ describe.skip('Promise e2e transactions', () => { }); it('makes a transfer with ERA (signAndSend)', async (done) => { - const nonce = await api.query.system.accountNonce(keyring.dave.address()) as Index; + const nonce = await api.query.system.accountNonce(keyring.dave.address) as Index; const signedBlock = await api.rpc.chain.getBlock(); const currentHeight = (signedBlock as SignedBlock).block.header.number; const exERA = new ExtrinsicEra({ current: currentHeight, period: 10 }); @@ -171,7 +171,7 @@ describe.skip('Promise e2e transactions', () => { const eraDeath = exERA.asMortalEra.death(currentHeight.toNumber()); console.log('STARTED AT :' + eraBirth + ' EXPIRED AT :' + eraDeath); const eraHash = await api.rpc.chain.getBlockHash(eraBirth); - const ex = api.tx.balances.transfer(keyring.eve.address(), 12345); + const ex = api.tx.balances.transfer(keyring.eve.address, 12345); const hash = await ex.signAndSend(keyring.dave, { blockHash: eraHash, era: exERA, nonce } as any); expect(hash.toHex()).toHaveLength(66); @@ -179,7 +179,7 @@ describe.skip('Promise e2e transactions', () => { }); it('makes a transfer with ERA (signAndSend) with invalid time', async (done) => { - const nonce = await api.query.system.accountNonce(keyring.alice.address()) as Index; + const nonce = await api.query.system.accountNonce(keyring.alice.address) as Index; const signedBlock = await api.rpc.chain.getBlock(); const currentHeight = (signedBlock as SignedBlock).block.header.number; const exERA = new ExtrinsicEra({ current: currentHeight, period: 4 }); @@ -187,7 +187,7 @@ describe.skip('Promise e2e transactions', () => { const eraDeath = exERA.asMortalEra.death(currentHeight.toNumber()); console.log('STARTED AT :' + eraBirth + ' EXPIRED AT :' + eraDeath); const eraHash = await api.rpc.chain.getBlockHash(eraBirth); - const ex = api.tx.balances.transfer(keyring.eve.address(), 12345); + const ex = api.tx.balances.transfer(keyring.eve.address, 12345); return ( api.rpc.chain.subscribeNewHead(async (header) => { diff --git a/packages/api/test/e2e/rx-queries.spec.ts b/packages/api/test/e2e/rx-queries.spec.ts index 13437667e0..df4a1df74d 100644 --- a/packages/api/test/e2e/rx-queries.spec.ts +++ b/packages/api/test/e2e/rx-queries.spec.ts @@ -32,7 +32,7 @@ describe.skip('Rx e2e queries', () => { }); it('queries state for a balance', (done) => { - api.query.balances.freeBalance(keyring.alice.address()).subscribe((balance) => { + api.query.balances.freeBalance(keyring.alice.address).subscribe((balance) => { expect(balance).toBeInstanceOf(BN); expect((balance as Balance).isZero()).toBe(false); done(); diff --git a/packages/api/test/e2e/rx-tx.spec.ts b/packages/api/test/e2e/rx-tx.spec.ts index ac72d96833..0e74ae8e36 100644 --- a/packages/api/test/e2e/rx-tx.spec.ts +++ b/packages/api/test/e2e/rx-tx.spec.ts @@ -26,12 +26,12 @@ describe.skip('Rx e2e transactions', () => { }); it('makes a transfer', (done) => { - (api.query.system.accountNonce(keyring.alice.address()) as Observable) + (api.query.system.accountNonce(keyring.alice.address) as Observable) .pipe( first(), switchMap((nonce: Index) => api.tx.balances - .transfer(keyring.bob.address(), 12345) + .transfer(keyring.bob.address, 12345) .sign(keyring.alice, { nonce }) .send() ) @@ -44,7 +44,7 @@ describe.skip('Rx e2e transactions', () => { }); it('makes a proposal', (done) => { - (api.query.system.accountNonce(keyring.alice.address()) as Observable) + (api.query.system.accountNonce(keyring.alice.address) as Observable) .pipe( first(), switchMap((nonce: Index) => diff --git a/packages/api/test/util/SingleAccountSigner.ts b/packages/api/test/util/SingleAccountSigner.ts index df6f8a1034..a7ba79ec1d 100644 --- a/packages/api/test/util/SingleAccountSigner.ts +++ b/packages/api/test/util/SingleAccountSigner.ts @@ -17,7 +17,7 @@ export default class SingleAccountSigner { } async sign (extrinsic: Extrinsic, address: string, options: SignatureOptions) { - if (!this.keyringPair || String(address) !== this.keyringPair.address()) { + if (!this.keyringPair || String(address) !== this.keyringPair.address) { throw new Error('does not have the keyringPair'); } diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 69b440b9d4..c873c24ced 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -30,6 +30,6 @@ "@polkadot/jsonrpc": "^0.81.0-beta.11", "@polkadot/rpc-provider": "^0.81.0-beta.11", "@polkadot/types": "^0.81.0-beta.11", - "@polkadot/util": "^0.93.0-beta.3" + "@polkadot/util": "^0.93.0-beta.4" } } diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index a0847de1af..69affca608 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -28,15 +28,15 @@ "dependencies": { "@babel/runtime": "^7.4.5", "@polkadot/storage": "^0.81.0-beta.11", - "@polkadot/util": "^0.93.0-beta.3", - "@polkadot/util-crypto": "^0.93.0-beta.3", + "@polkadot/util": "^0.93.0-beta.4", + "@polkadot/util-crypto": "^0.93.0-beta.4", "@types/nock": "^10.0.3", "eventemitter3": "^3.1.0", "isomorphic-fetch": "^2.2.1", "websocket": "^1.0.28" }, "devDependencies": { - "@polkadot/keyring": "^0.93.0-beta.3", + "@polkadot/keyring": "^0.93.0-beta.4", "mock-socket": "^8.0.5", "nock": "^10.0.4" } diff --git a/packages/rpc-provider/src/mock/index.ts b/packages/rpc-provider/src/mock/index.ts index 1f97e4e78f..04881f5022 100644 --- a/packages/rpc-provider/src/mock/index.ts +++ b/packages/rpc-provider/src/mock/index.ts @@ -151,8 +151,8 @@ export default class Mock implements ProviderInterface { // increment the balances and nonce for each account keyring.getPairs().forEach(({ publicKey }, index) => { - this.setStateBn(storage.balances.freeBalance(publicKey()), newHead.blockNumber.muln(3).iaddn(index)); - this.setStateBn(storage.system.accountNonce(publicKey()), newHead.blockNumber.addn(index)); + this.setStateBn(storage.balances.freeBalance(publicKey), newHead.blockNumber.muln(3).iaddn(index)); + this.setStateBn(storage.system.accountNonce(publicKey), newHead.blockNumber.addn(index)); }); // set the timestamp for the current block diff --git a/packages/rpc-rx/package.json b/packages/rpc-rx/package.json index 0add8343cd..437e1aa5f0 100644 --- a/packages/rpc-rx/package.json +++ b/packages/rpc-rx/package.json @@ -35,6 +35,6 @@ "rxjs": "^6.5.2" }, "devDependencies": { - "@polkadot/keyring": "^0.93.0-beta.3" + "@polkadot/keyring": "^0.93.0-beta.4" } } diff --git a/packages/rpc-rx/src/cached.spec.ts b/packages/rpc-rx/src/cached.spec.ts index 7fa174c404..9ccaa8df95 100644 --- a/packages/rpc-rx/src/cached.spec.ts +++ b/packages/rpc-rx/src/cached.spec.ts @@ -60,8 +60,8 @@ describe('createCachedObservable', () => { }); it('creates a single observable (multiple calls, different arguments that should be cached together)', () => { - const observable1 = creator(keyring.alice.address()); - const observable2 = creator(new AccountId(keyring.alice.address())); + const observable1 = creator(keyring.alice.address); + const observable2 = creator(new AccountId(keyring.alice.address)); expect( observable2 diff --git a/packages/type-extrinsics/package.json b/packages/type-extrinsics/package.json index f8cab6896b..f2fcb009b5 100644 --- a/packages/type-extrinsics/package.json +++ b/packages/type-extrinsics/package.json @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.4.5", "@polkadot/types": "^0.81.0-beta.11", - "@polkadot/util": "^0.93.0-beta.3" + "@polkadot/util": "^0.93.0-beta.4" } } diff --git a/packages/type-extrinsics/src/index.spec.ts b/packages/type-extrinsics/src/index.spec.ts index 62c7598ec7..2e6da65653 100644 --- a/packages/type-extrinsics/src/index.spec.ts +++ b/packages/type-extrinsics/src/index.spec.ts @@ -29,7 +29,7 @@ describe('extrinsics', () => { it('encodes an actual transfer (actual data)', () => { expect( new Extrinsic( - extrinsics.balances.transfer(keyring.bob.publicKey(), 6969) + extrinsics.balances.transfer(keyring.bob.publicKey, 6969) ).sign(keyring.alice, { blockHash: '0xec7afaf1cca720ce88c1d1b689d81f0583cc15a97d621cf046dd9abf605ef22f', nonce: 0 diff --git a/packages/type-extrinsics/test/e2e/transfer.spec.ts b/packages/type-extrinsics/test/e2e/transfer.spec.ts index 08a652f79d..769136165a 100644 --- a/packages/type-extrinsics/test/e2e/transfer.spec.ts +++ b/packages/type-extrinsics/test/e2e/transfer.spec.ts @@ -36,7 +36,7 @@ describe.skip('e2e transfer', () => { return api.chain .getBlockHash(0) .then((genesisHash) => { - const extrinsic = extrinsics.balances.transfer(keyring.bob.publicKey(), 6969) as any; + const extrinsic = extrinsics.balances.transfer(keyring.bob.publicKey, 6969) as any; extrinsic.sign(keyring.alice, { blockHash: genesisHash, nonce: 0 }); return api.author.submitExtrinsic(extrinsic.toU8a()); @@ -47,7 +47,7 @@ describe.skip('e2e transfer', () => { return api.chain .getBlockHash(0) .then((genesisHash) => { - const extrinsic = extrinsics.balances.transfer(keyring.bob.publicKey(), 6969) as any; + const extrinsic = extrinsics.balances.transfer(keyring.bob.publicKey, 6969) as any; extrinsic.sign(keyring.alice, { blockHash: genesisHash, nonce: 0 }); return api.author.submitAndWatchExtrinsic(extrinsic, (result: SubmittableResult) => { diff --git a/packages/type-storage/package.json b/packages/type-storage/package.json index 94c8176289..0065e22bd6 100644 --- a/packages/type-storage/package.json +++ b/packages/type-storage/package.json @@ -28,10 +28,10 @@ "dependencies": { "@babel/runtime": "^7.4.5", "@polkadot/types": "^0.81.0-beta.11", - "@polkadot/util": "^0.93.0-beta.3", - "@polkadot/util-crypto": "^0.93.0-beta.3" + "@polkadot/util": "^0.93.0-beta.4", + "@polkadot/util-crypto": "^0.93.0-beta.4" }, "devDependencies": { - "@polkadot/keyring": "^0.93.0-beta.3" + "@polkadot/keyring": "^0.93.0-beta.4" } } diff --git a/packages/type-storage/src/fromMetadata/fromMetadata.spec.ts b/packages/type-storage/src/fromMetadata/fromMetadata.spec.ts index 97e34a4cf1..61bdad8339 100644 --- a/packages/type-storage/src/fromMetadata/fromMetadata.spec.ts +++ b/packages/type-storage/src/fromMetadata/fromMetadata.spec.ts @@ -26,7 +26,7 @@ describe('fromMetadata', () => { it('should return the correct length-prefixed storage key', () => { expect( u8aToHex( - storage.balances.freeBalance(keyring.alice.address()) + storage.balances.freeBalance(keyring.alice.address) ) ).toEqual( '0x807f864e18e3dd8b58386310d2fe0919eef27c6e558564b7f67f22d99d20f587bb' diff --git a/packages/types/package.json b/packages/types/package.json index 016d845f84..0606fd8497 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -27,10 +27,10 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme", "dependencies": { "@babel/runtime": "^7.4.5", - "@polkadot/util": "^0.93.0-beta.3", - "@polkadot/util-crypto": "^0.93.0-beta.3" + "@polkadot/util": "^0.93.0-beta.4", + "@polkadot/util-crypto": "^0.93.0-beta.4" }, "devDependencies": { - "@polkadot/keyring": "^0.93.0-beta.3" + "@polkadot/keyring": "^0.93.0-beta.4" } } diff --git a/packages/types/src/type/ExtrinsicSignature.ts b/packages/types/src/type/ExtrinsicSignature.ts index c097de97d5..e1d4a3ec84 100644 --- a/packages/types/src/type/ExtrinsicSignature.ts +++ b/packages/types/src/type/ExtrinsicSignature.ts @@ -147,7 +147,7 @@ export default class ExtrinsicSignature extends Struct implements IExtrinsicSign * @description Generate a payload and pplies the signature from a keypair */ sign (method: Method, account: IKeyringPair, { blockHash, era, nonce, version }: SignatureOptions): ExtrinsicSignature { - const signer = new Address(account.publicKey()); + const signer = new Address(account.publicKey); const signingPayload = new SignaturePayload({ nonce, method, diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts index 41e5e2ce24..1560deb77f 100644 --- a/packages/types/src/types.ts +++ b/packages/types/src/types.ts @@ -10,8 +10,8 @@ import Method from './primitive/Method'; import Address from './primitive/Address'; export type IKeyringPair = { - address: () => string, - publicKey: () => Uint8Array, + address: string, + publicKey: Uint8Array, sign: (data: Uint8Array) => Uint8Array; }; diff --git a/yarn.lock b/yarn.lock index dec5d5da58..4dbdf6251b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1801,14 +1801,14 @@ typescript "^3.5.1" vuepress "^1.0.1" -"@polkadot/keyring@^0.93.0-beta.3": - version "0.93.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.93.0-beta.3.tgz#3d980c6546e4b7f49b83a621621412f1d322db1b" - integrity sha512-mjU1mycuIOdXgbwDVlVwnojaBxtfraoiKvilG14EvG5bCMEQoGU3jUdOTXQs7v1bhrjmrXFMfixaZlco394Gow== +"@polkadot/keyring@^0.93.0-beta.4": + version "0.93.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.93.0-beta.4.tgz#b3057226cc2cf735db71e69954bface853b4d9fc" + integrity sha512-n3xmbPd1FpAQ3B2oZAV+i16fTvSQtg3L1ksg62ZwAt0IqkDV9eTiQIW9OWJkSCvwXQg+6BiW9sjQsvyvxlAuvw== dependencies: "@babel/runtime" "^7.4.5" - "@polkadot/util" "^0.93.0-beta.3" - "@polkadot/util-crypto" "^0.93.0-beta.3" + "@polkadot/util" "^0.93.0-beta.4" + "@polkadot/util-crypto" "^0.93.0-beta.4" "@types/bs58" "^4.0.0" bs58 "^4.0.1" @@ -1819,13 +1819,13 @@ dependencies: "@types/chrome" "^0.0.86" -"@polkadot/util-crypto@^0.93.0-beta.3": - version "0.93.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.93.0-beta.3.tgz#8d590c18fa7cd72042a53d6a79332f1fcac98758" - integrity sha512-o6K36gz47Zuqd1e//sNmx5axGCMJrZRJMgXZQgSXPBgb423JFR3IZYZVqQx+r+k5xTqH6t9VhXfv55jE5YyFiA== +"@polkadot/util-crypto@^0.93.0-beta.4": + version "0.93.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.93.0-beta.4.tgz#c90444eece226ad6be50f5ef87073366af3be211" + integrity sha512-QFpMicYVDhOFy6JGagH4vNQ0ppmYi8CxXFgevtA3/CD1CmcGhiYCyIvIKB5a+L3QJBbJck0mZc/bbkt+y9Wm5A== dependencies: "@babel/runtime" "^7.4.5" - "@polkadot/util" "^0.93.0-beta.3" + "@polkadot/util" "^0.93.0-beta.4" "@polkadot/wasm-crypto" "^0.11.1" "@types/bip39" "^2.4.2" "@types/pbkdf2" "^3.0.0" @@ -1838,10 +1838,10 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^0.93.0-beta.3": - version "0.93.0-beta.3" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.93.0-beta.3.tgz#6334ab1026f743f3a4f45740091066ee8041aff7" - integrity sha512-rFRcT8OHXNvx+tGMeDRZOAoeGguiRVsEk5+MYXViq0sjuK+YWioWmDEN+HiiqBB2Qih0BQ+UEZ63MXqZAwH2vg== +"@polkadot/util@^0.93.0-beta.4": + version "0.93.0-beta.4" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.93.0-beta.4.tgz#a46dbd597118bd88f6f0712cd5ad0a5b4f0deb74" + integrity sha512-vG17Z5Fhfdz50/teeDAV6Nvo5ceBNIes2pH/GkWCaWcOdE5lTP2IUTAZmhwbbNEA+/9Dcb2AUgj5dh9qRkZntg== dependencies: "@babel/runtime" "^7.4.5" "@types/bn.js" "^4.11.5"