Skip to content

Commit

Permalink
Sprint 30 2 (#987)
Browse files Browse the repository at this point in the history
* All web test passing after fixing blade dependency when using jest

Signed-off-by: Miguel Ángel <[email protected]>

* 'Fees management' left side menu option hidden when using Metamask

Signed-off-by: Miguel Ángel <[email protected]>

* Metamask string from enum class

Signed-off-by: Miguel Ángel <[email protected]>

* screens

* Update doc

Signed-off-by: Miguel Ángel <[email protected]>

* changes

* custom Mirror Node RPC

Signed-off-by: Kenny Gomez <[email protected]>

* delete

* fix tests

* 1.11.0 version opened

Signed-off-by: Miguel Ángel <[email protected]>

* header and name of env properties

* New version 1.11.0 in FACTORY_VERSION.md file

Signed-off-by: Miguel Ángel <[email protected]>

* Change assertion in contracts 'should rescue 1 HBAR' test

Signed-off-by: Miguel Ángel <[email protected]>

* hedera-smart-contracts dependency updated from 0.4.0 to 0.6.0

Signed-off-by: Miguel Ángel <[email protected]>

* custom Mirror Node RPC

Signed-off-by: Kenny Gomez <[email protected]>

* Add header to list and change icon

* custom Mirror Node RPC

Signed-off-by: Kenny Gomez <[email protected]>

* Change adding mirror/rpc button label

Signed-off-by: Miguel Ángel <[email protected]>

* Prettier

Signed-off-by: Miguel Ángel <[email protected]>

* Fixing warning

Signed-off-by: Miguel Ángel <[email protected]>

* Blade plugin initializing

Signed-off-by: Kenny Gomez <[email protected]>

* 2.38.0 version of @hashgraph/sdk

Signed-off-by: Miguel Ángel <[email protected]>

* Fix warnings

Signed-off-by: Miguel Ángel <[email protected]>

* Blade plugin initializing

Signed-off-by: Kenny Gomez <[email protected]>

* Blade plugin initializing

Signed-off-by: Kenny Gomez <[email protected]>

* Some fixes

Signed-off-by: Miguel Ángel <[email protected]>

---------

Signed-off-by: Miguel Ángel <[email protected]>
Signed-off-by: Kenny Gomez <[email protected]>
Co-authored-by: Adrian Escacena <[email protected]>
Co-authored-by: Kenny Gomez <[email protected]>
Co-authored-by: m-francia <[email protected]>
  • Loading branch information
4 people authored Dec 1, 2023
1 parent 9ef3eec commit 8d707db
Show file tree
Hide file tree
Showing 29 changed files with 10,141 additions and 120 deletions.
1 change: 1 addition & 0 deletions FACTORY_VERSION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
|Version | Contract name | Address | Network |
|--------|----------------|--------------|------------|
| 1.11.0 | FactoryAddress | 0.0.1137631 | Testnet |
| 1.10.0 | FactoryAddress | 0.0.1137631 | Testnet |
| 1.9.1 | FactoryAddress | 0.0.1137631 | Testnet |
| 1.9.0 | FactoryAddress | 0.0.1137631 | Testnet |
Expand Down
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hashgraph/stablecoin-npm-cli",
"version": "1.10.0",
"version": "1.11.0",
"description": "CLI for Hedera Stablecoin",
"main": "./build/src/index.js",
"bin": {
Expand Down
4 changes: 2 additions & 2 deletions contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hashgraph/stablecoin-npm-contracts",
"version": "1.10.0",
"version": "1.11.0",
"description": "",
"main": "./build/typechain-types/index.js",
"module": "./build/typechain-types/index.js",
Expand Down Expand Up @@ -122,7 +122,7 @@
"@chainlink/contracts": "^0.5.1",
"@openzeppelin/contracts": "^4.8.2",
"@openzeppelin/contracts-upgradeable": "^4.8.2",
"@hashgraph/smart-contracts": "github:hashgraph/hedera-smart-contracts#v0.4.0",
"@hashgraph/smart-contracts": "github:hashgraph/hedera-smart-contracts#v0.6.0",
"chai-as-promised": "^7.1.1",
"dotenv": "^16.0.3",
"ethers": "5.7.2",
Expand Down
9 changes: 3 additions & 6 deletions contracts/test/rescuable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ describe('Rescue Tests', function () {
)
})

it('Should rescue 10 HBAR', async function () {
it('Should rescue 1 HBAR', async function () {
// Get the initial balance of the token owner and client
const AmountToRescue = BigNumber.from(10).mul(HBARFactor)
const AmountToRescue = BigNumber.from(1).mul(HBARFactor)
const initialTokenOwnerBalance = await getHBARBalanceOf(
proxyAddress.toString(),
operatorClient,
Expand All @@ -335,7 +335,6 @@ describe('Rescue Tests', function () {
true,
false
)

// rescue some tokens
await rescueHBAR(proxyAddress, AmountToRescue, operatorClient)
await delay(3000)
Expand All @@ -356,12 +355,10 @@ describe('Rescue Tests', function () {

const expectedTokenOwnerBalance =
initialTokenOwnerBalance.sub(AmountToRescue)
const diffClientBalance = finalClientBalance.sub(initialClientBalance)

expect(finalTokenOwnerBalance.toString()).to.equals(
expectedTokenOwnerBalance.toString()
)
expect(diffClientBalance.gt(BigNumber.from(0))).to.be.true
expect(finalClientBalance.gt(initialClientBalance)).to.be.true
})

it('we cannot rescue more HBAR than the owner balance', async function () {
Expand Down
2 changes: 1 addition & 1 deletion defenders/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "accelerator-service",
"version": "1.10.0",
"version": "1.11.0",
"description": "Accelerator integration with OZ Defenders",
"license": "MIT",
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion hashconnect/lib/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ coverage
*.log
.gitlab-ci.yml

package-lock.json
/*.tgz
/tmp*
/mnt/
Expand Down
Loading

0 comments on commit 8d707db

Please sign in to comment.