git.delta.rocks / unique-network / refs/commits / 7e36fe0db195

difftreelog

Merge branch 'develop' into feature/autoseal-every-n-secs

Igor Kozyrev2022-04-01parents: #1ce1209 #62bde24.patch.diff
in: master

4 files changed

modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -152,7 +152,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 918000,
+	spec_version: 918001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -152,7 +152,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 918000,
+	spec_version: 918001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -151,7 +151,7 @@
 	spec_name: create_runtime_str!(RUNTIME_NAME),
 	impl_name: create_runtime_str!(RUNTIME_NAME),
 	authoring_version: 1,
-	spec_version: 918000,
+	spec_version: 918001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
addedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
after · tests/src/eth/collectionSponsoring.test.ts
1import privateKey from '../substrate/privateKey';2import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, setCollectionSponsorExpectSuccess} from '../util/helpers';3import {itWeb3, transferBalanceToEth, subToEth, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents} from './util/helpers';4import nonFungibleAbi from './nonFungibleAbi.json';5import {expect} from 'chai';67describe('evm collection sponsoring', () => {8  itWeb3('sponsors mint transactions', async ({api, web3}) => {9    const alice = privateKey('//Alice');1011    const collection = await createCollectionExpectSuccess();12    await setCollectionSponsorExpectSuccess(collection, alice.address);13    await confirmSponsorshipExpectSuccess(collection);1415    // Wouldn't be needed after CORE-30016    await transferBalanceToEth(api, alice, subToEth(alice.address));1718    const minter = createEthAccount(web3);19    expect(await web3.eth.getBalance(minter)).to.equal('0');2021    const address = collectionIdToAddress(collection);22    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collection), {from: minter, ...GAS_ARGS});2324    await enablePublicMintingExpectSuccess(alice, collection);25    await addToAllowListExpectSuccess(alice, collection, {Ethereum: minter});2627    const nextTokenId = await contract.methods.nextTokenId().call();28    expect(nextTokenId).to.equal('1');29    const result = await contract.methods.mint(minter, nextTokenId).send();30    const events = normalizeEvents(result.events);31    expect(events).to.be.deep.equal([32      {33        address,34        event: 'Transfer',35        args: {36          from: '0x0000000000000000000000000000000000000000',37          to: minter,38          tokenId: nextTokenId,39        },40      },41    ]);42  });43});