`46515fa1c836`

diff tree log

Deprecate ethereum methods

9 files changed

modifiedtests/src/eth/abi/fungibleDeprecated.jsondiff before after both

1[2  {3    "inputs": [4      { "internalType": "address", "name": "newAdmin", "type": "address" }5    ],6    "name": "addCollectionAdmin",7    "outputs": [],8    "stateMutability": "nonpayable",9    "type": "function"10  },11  {12    "inputs": [13      { "internalType": "address", "name": "user", "type": "address" }14    ],15    "name": "addToCollectionAllowList",16    "outputs": [],17    "stateMutability": "nonpayable",18    "type": "function"19  },20  {21    "inputs": [22      { "internalType": "address", "name": "from", "type": "address" },23      { "internalType": "uint256", "name": "amount", "type": "uint256" }24    ],25    "name": "burnFrom",26    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],27    "stateMutability": "nonpayable",28    "type": "function"29  },30  {31    "inputs": [32      { "internalType": "address", "name": "newOwner", "type": "address" }33    ],34    "name": "changeCollectionOwner",35    "outputs": [],36    "stateMutability": "nonpayable",37    "type": "function"38  },39  {40    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],41    "name": "deleteCollectionProperty",42    "outputs": [],43    "stateMutability": "nonpayable",44    "type": "function"45  },46  {47    "inputs": [48      { "internalType": "address", "name": "user", "type": "address" }49    ],50    "name": "isOwnerOrAdmin",51    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],52    "stateMutability": "view",53    "type": "function"54  },55  {56    "inputs": [57      { "internalType": "address", "name": "admin", "type": "address" }58    ],59    "name": "removeCollectionAdmin",60    "outputs": [],61    "stateMutability": "nonpayable",62    "type": "function"63  },64  {65    "inputs": [66      { "internalType": "address", "name": "user", "type": "address" }67    ],68    "name": "removeFromCollectionAllowList",69    "outputs": [],70    "stateMutability": "nonpayable",71    "type": "function"72  },73  {74    "inputs": [75      { "internalType": "string", "name": "key", "type": "string" },76      { "internalType": "bytes", "name": "value", "type": "bytes" }77    ],78    "name": "setCollectionProperty",79    "outputs": [],80    "stateMutability": "nonpayable",81    "type": "function"82  },83  {84    "inputs": [85      { "internalType": "address", "name": "sponsor", "type": "address" }86    ],87    "name": "setCollectionSponsor",88    "outputs": [],89    "stateMutability": "nonpayable",90    "type": "function"91  },92  {93    "inputs": [94      { "internalType": "address", "name": "newOwner", "type": "address" }95    ],96    "name": "changeCollectionOwner",97    "outputs": [],98    "stateMutability": "nonpayable",99    "type": "function"100  }101]

1[2  {3    "inputs": [4      { "internalType": "address", "name": "newAdmin", "type": "address" }5    ],6    "name": "addCollectionAdmin",7    "outputs": [],8    "stateMutability": "nonpayable",9    "type": "function"10  },11  {12    "inputs": [13      { "internalType": "address", "name": "user", "type": "address" }14    ],15    "name": "addToCollectionAllowList",16    "outputs": [],17    "stateMutability": "nonpayable",18    "type": "function"19  },20  {21    "inputs": [22      { "internalType": "address", "name": "from", "type": "address" },23      { "internalType": "uint256", "name": "amount", "type": "uint256" }24    ],25    "name": "burnFrom",26    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],27    "stateMutability": "nonpayable",28    "type": "function"29  },30  {31    "inputs": [32      { "internalType": "address", "name": "newOwner", "type": "address" }33    ],34    "name": "changeCollectionOwner",35    "outputs": [],36    "stateMutability": "nonpayable",37    "type": "function"38  },39  {40    "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],41    "name": "deleteCollectionProperty",42    "outputs": [],43    "stateMutability": "nonpayable",44    "type": "function"45  },46  {47    "inputs": [48      { "internalType": "address", "name": "user", "type": "address" }49    ],50    "name": "isOwnerOrAdmin",51    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],52    "stateMutability": "view",53    "type": "function"54  },55  {56    "inputs": [57      { "internalType": "address", "name": "admin", "type": "address" }58    ],59    "name": "removeCollectionAdmin",60    "outputs": [],61    "stateMutability": "nonpayable",62    "type": "function"63  },64  {65    "inputs": [66      { "internalType": "address", "name": "user", "type": "address" }67    ],68    "name": "removeFromCollectionAllowList",69    "outputs": [],70    "stateMutability": "nonpayable",71    "type": "function"72  },73  {74    "inputs": [75      { "internalType": "string", "name": "key", "type": "string" },76      { "internalType": "bytes", "name": "value", "type": "bytes" }77    ],78    "name": "setCollectionProperty",79    "outputs": [],80    "stateMutability": "nonpayable",81    "type": "function"82  },83  {84    "inputs": [85      { "internalType": "address", "name": "sponsor", "type": "address" }86    ],87    "name": "setCollectionSponsor",88    "outputs": [],89    "stateMutability": "nonpayable",90    "type": "function"91  }92]

modifiedtests/src/eth/abi/nonFungible.jsondiff before after both

--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -51,12 +51,6 @@
   },
   {
     "anonymous": false,
-    "inputs": [],
-    "name": "MintingFinished",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
     "inputs": [
       {
         "indexed": true,
@@ -420,13 +414,6 @@
     "name": "description",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
     "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "finishMinting",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
     "type": "function"
   },
   {
@@ -513,13 +500,6 @@
     "name": "mintWithTokenURI",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
     "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "mintingFinished",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
     "type": "function"
   },
   {

modifiedtests/src/eth/abi/reFungible.jsondiff before after both

--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -51,12 +51,6 @@
   },
   {
     "anonymous": false,
-    "inputs": [],
-    "name": "MintingFinished",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
     "inputs": [
       {
         "indexed": true,
@@ -402,13 +396,6 @@
     "name": "description",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
     "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "finishMinting",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
     "type": "function"
   },
   {
@@ -495,13 +482,6 @@
     "name": "mintWithTokenURI",
     "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
     "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "mintingFinished",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
     "type": "function"
   },
   {

modifiedtests/src/eth/abi/reFungibleDeprecated.jsondiff before after both

--- a/tests/src/eth/abi/reFungibleDeprecated.json
+++ b/tests/src/eth/abi/reFungibleDeprecated.json
@@ -82,6 +82,17 @@
   },
   {
     "inputs": [
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+      { "internalType": "string", "name": "key", "type": "string" },
+      { "internalType": "bytes", "name": "value", "type": "bytes" }
+    ],
+    "name": "setProperty",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "newOwner", "type": "address" }
     ],
     "name": "changeCollectionOwner",

modifiedtests/src/eth/abi/reFungibleToken.jsondiff before after both

--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -98,16 +98,6 @@
   },
   {
     "inputs": [
-      { "internalType": "address", "name": "from", "type": "address" },
-      { "internalType": "uint256", "name": "amount", "type": "uint256" }
-    ],
-    "name": "burnFrom",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
       {
         "components": [
           { "internalType": "address", "name": "eth", "type": "address" },

addedtests/src/eth/abi/reFungibleTokenDeprecated.jsondiff before after both

--- /dev/null
+++ b/tests/src/eth/abi/reFungibleTokenDeprecated.json
@@ -0,0 +1,12 @@
+[
+  {
+    "inputs": [
+      { "internalType": "address", "name": "from", "type": "address" },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "burnFrom",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

modifiedtests/src/eth/reFungible.test.tsdiff before after both

--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -74,7 +74,7 @@
 
     const result = await contract.methods.mint(caller).send();
     const tokenId = result.events.Transfer.returnValues.tokenId;
-    const tokenContract = await helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller);
+    const tokenContract = await helper.ethNativeContract.rftTokenById(collectionId, tokenId, caller, true);
 
     await tokenContract.methods.repartition(2).send();
     await tokenContract.methods.transfer(receiver, 1).send();
@@ -316,7 +316,7 @@
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = await helper.ethNativeContract.collection(address, 'rft');
 
-    const rftToken = await helper.ethNativeContract.rftTokenById(token.collectionId, token.tokenId, owner);
+    const rftToken = await helper.ethNativeContract.rftTokenById(token.collectionId, token.tokenId, owner, true);
 
     {
       await rftToken.methods.approve(operator, 15n).send({from: owner});

modifiedtests/src/eth/reFungibleToken.test.tsdiff before after both

--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -458,7 +458,7 @@
     const result = await contract.methods.mint(caller).send();
     const tokenId = result.events.Transfer.returnValues.tokenId;
     const tokenAddress = helper.ethAddress.fromTokenId(collectionId, tokenId);
-    const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, caller);
+    const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, caller, true);
 
     await tokenContract.methods.repartition(2).send();
     await tokenContract.methods.transfer(receiver, 1).send();

modifiedtests/src/eth/util/playgrounds/unique.dev.tsdiff before after both

--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -29,6 +29,7 @@
 import refungibleAbi from '../../abi/reFungible.json';
 import refungibleDeprecatedAbi from '../../abi/reFungibleDeprecated.json';
 import refungibleTokenAbi from '../../abi/reFungibleToken.json';
+import refungibleTokenDeprecatedAbi from '../../abi/reFungibleTokenDeprecated.json';
 import contractHelpersAbi from '../../abi/contractHelpers.json';
 import {ICrossAccountId, TEthereumAccount} from '../../../util/playgrounds/types';
 import {TCollectionMode} from '../../../util/playgrounds/types';
@@ -187,17 +188,18 @@
     return this.collection(this.helper.ethAddress.fromCollectionId(collectionId), mode, caller, mergeDeprecated);
   }
 
-  async rftToken(address: string, caller?: string) {
+  async rftToken(address: string, caller?: string, mergeDeprecated = false) {
     const web3 = this.helper.getWeb3();
-    return unlimitedMoneyHack(new web3.eth.Contract(refungibleTokenAbi as any, address, {
+    const abi = mergeDeprecated ? [...refungibleTokenAbi, ...refungibleTokenDeprecatedAbi] : refungibleTokenAbi;
+    return unlimitedMoneyHack(new web3.eth.Contract(abi as any, address, {
       gas: this.helper.eth.DEFAULT_GAS,
       gasPrice: await this.getGasPrice(),
       ...(caller ? {from: caller} : {}),
     }));
   }
 
-  rftTokenById(collectionId: number, tokenId: number, caller?: string) {
-    return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller);
+  rftTokenById(collectionId: number, tokenId: number, caller?: string, mergeDeprecated = false) {
+    return this.rftToken(this.helper.ethAddress.fromTokenId(collectionId, tokenId), caller, mergeDeprecated);
   }
 }