Skip to content

Commit 65fe3f4

Browse files
Merge branch 'dev-protocol:main' into fix-new
2 parents 7c17951 + 9eb6bd2 commit 65fe3f4

File tree

3 files changed

+206
-3203
lines changed

3 files changed

+206
-3203
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
"author": "aggre",
2424
"license": "MPL-2.0",
2525
"devDependencies": {
26-
"@devprotocol/util-ts": "2.2.1",
26+
"@devprotocol/util-ts": "3.0.0",
2727
"@truffle/hdwallet-provider": "2.1.4",
2828
"@typechain/truffle-v4": "4.1.0",
2929
"@types/bent": "7.3.3",
3030
"@types/dotenv": "8.2.0",
3131
"@types/node": "18.11.18",
3232
"@types/shelljs": "0.8.11",
33-
"@typescript-eslint/eslint-plugin": "5.48.0",
34-
"@typescript-eslint/parser": "5.48.0",
33+
"@typescript-eslint/eslint-plugin": "5.48.1",
34+
"@typescript-eslint/parser": "5.48.1",
3535
"arb-ethers-web3-bridge": "0.7.3",
3636
"bent": "7.3.12",
3737
"bignumber.js": "9.1.1",
@@ -43,7 +43,7 @@
4343
"eslint-config-xo-typescript": "0.55.1",
4444
"husky": "8.0.3",
4545
"p-queue": "7.3.0",
46-
"prettier": "2.8.1",
46+
"prettier": "2.8.2",
4747
"prettier-plugin-solidity": "1.1.1",
4848
"solhint": "3.3.7",
4949
"truffle": "5.4.1",
@@ -56,7 +56,7 @@
5656
"typescript": "4.9.4",
5757
"web3": "1.8.1",
5858
"web3-utils": "1.8.1",
59-
"js-base64": "3.7.3"
59+
"js-base64": "3.7.4"
6060
},
6161
"dependencies": {
6262
"@devprotocol/util-contracts": "3.3.0",

test/s-token/s-token-manager.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,20 @@ contract('STokensManager', ([deployer, user]) => {
345345
'10000',
346346
web3.utils.keccak256('PAYLOAD')
347347
)
348+
const latestTokenId = 1
349+
const position = await dev.sTokensManager.positions(latestTokenId)
350+
expect(position.property).to.equal(property.address)
351+
expect(toBigNumber(position.amount).toNumber()).to.equal(10000)
352+
expect(
353+
await dev.sTokensManager.descriptorOf(position.property)
354+
).to.equal(descriptorCopy.address)
355+
expect(
356+
await dev.sTokensManager.descriptorOfPropertyByPayload(
357+
position.property,
358+
web3.utils.keccak256('PAYLOAD')
359+
)
360+
).to.equal(descriptor.address)
361+
expect(await descriptorCopy.shouldBe()).to.equal(false)
348362
})
349363
})
350364
describe('fail', () => {

0 commit comments

Comments
 (0)