Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qa test #237

Merged
merged 35 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2cc419e
Fixed LBC deploy
gsoares85 Feb 21, 2024
2efcab0
Merge pull request #221 from rsksmart/bugfix/fixLBCDeploy
gsoares85 Feb 23, 2024
016f0be
chore: remove build folder from .gitignore
Luisfc68 Feb 27, 2024
7f76691
Merge pull request #222 from rsksmart/feature/GBI-1696
Luisfc68 Mar 8, 2024
2cab01b
chore: lbc dev env deploy
Luisfc68 Mar 8, 2024
da2c521
chore: install btc lib from public registry (#225)
Luisfc68 Mar 20, 2024
35559e9
fix: remove initializeV2 function
Luisfc68 Apr 15, 2024
aa08a8b
Merge pull request #228 from rsksmart/bugfix/GBI-1813
Luisfc68 Apr 17, 2024
e01e502
feat: add lp url update capability
Luisfc68 Apr 17, 2024
a99aebd
Merge branch 'QA-Test' into feature/GBI-1735
Luisfc68 Apr 25, 2024
7fce963
Merge pull request #229 from rsksmart/feature/GBI-1770
Luisfc68 Apr 25, 2024
ddcd3ac
Merge branch 'QA-Test' into feature/GBI-1735
Luisfc68 Apr 25, 2024
217a812
fix: add development to network array
Luisfc68 Apr 25, 2024
48d3015
chore: move rpc urls to env
Luisfc68 Apr 25, 2024
45bae1e
Merge pull request #223 from rsksmart/feature/GBI-1735
Luisfc68 Apr 25, 2024
ed66d73
refactor: update BtcUtils version
Luisfc68 May 16, 2024
f320818
fix: merge withdraw collateral functions
Luisfc68 May 16, 2024
1c48b85
chore: add npm login for priv pkg
Luisfc68 May 17, 2024
7bdf9fd
Merge pull request #230 from rsksmart/bugfix/GBI-1873
Luisfc68 May 20, 2024
46f0a94
chore: deploy in dev environment
Luisfc68 May 21, 2024
ad009bc
chore: update btc lib version
Luisfc68 May 21, 2024
5c10f48
docs: update readme
Luisfc68 May 21, 2024
5fd58be
Merge branch 'dev-deploy' into security-preparation
Luisfc68 May 21, 2024
fff32f7
chore: fix vulnerable packages
Luisfc68 May 21, 2024
0e39bf1
chore: update deployment scripts
Luisfc68 May 22, 2024
8d59a96
1.2.0
Luisfc68 May 22, 2024
1a5ecfc
chore: dev deployment
Luisfc68 May 22, 2024
23f70b7
chore: Upgrade LBC to v2
gsoares85 May 22, 2024
7540ad7
Merge pull request #231 from rsksmart/security-preparation
Luisfc68 May 22, 2024
c3e32ed
chore: btc lib update
Luisfc68 Jul 25, 2024
3300dd1
Merge pull request #235 from rsksmart/feature/GBI-2026
Luisfc68 Jul 25, 2024
2d43fc4
chore: upgraded LBC
gsoares85 Jul 25, 2024
16236b0
Merge pull request #236 from rsksmart/chore/upgrade-LBC-contract
gsoares85 Jul 25, 2024
efcf401
Merge branch 'Stable-Test' into conflict-fix
Luisfc68 Jul 25, 2024
fa8d119
Merge pull request #238 from rsksmart/conflict-fix
Luisfc68 Jul 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,480 changes: 5,480 additions & 0 deletions .openzeppelin/unknown-31.json

Large diffs are not rendered by default.

1,824 changes: 912 additions & 912 deletions build/contracts/Address.json

Large diffs are not rendered by default.

2,499 changes: 1,549 additions & 950 deletions build/contracts/AddressUpgradeable.json

Large diffs are not rendered by default.

2,192 changes: 1,096 additions & 1,096 deletions build/contracts/Bridge.json

Large diffs are not rendered by default.

8,929 changes: 4,465 additions & 4,464 deletions build/contracts/BridgeMock.json

Large diffs are not rendered by default.

13,192 changes: 7,418 additions & 5,774 deletions build/contracts/BtcUtils.json

Large diffs are not rendered by default.

205 changes: 144 additions & 61 deletions build/contracts/Context.json

Large diffs are not rendered by default.

335 changes: 214 additions & 121 deletions build/contracts/ContextUpgradeable.json

Large diffs are not rendered by default.

1,374 changes: 689 additions & 685 deletions build/contracts/ERC1967Proxy.json

Large diffs are not rendered by default.

1,853 changes: 851 additions & 1,002 deletions build/contracts/ERC1967Upgrade.json

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions build/contracts/IBeacon.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@
"absolutePath": "@openzeppelin/contracts/proxy/beacon/IBeacon.sol",
"exportedSymbols": {
"IBeacon": [
1239
1314
]
},
"id": 1240,
"id": 1315,
"license": "MIT",
"nodeType": "SourceUnit",
"nodes": [
{
"id": 1231,
"id": 1306,
"literals": [
"solidity",
"^",
"0.8",
".0"
],
"nodeType": "PragmaDirective",
"src": "93:23:10"
"src": "93:23:11"
},
{
"abstract": false,
Expand All @@ -54,65 +54,65 @@
"contractDependencies": [],
"contractKind": "interface",
"documentation": {
"id": 1232,
"id": 1307,
"nodeType": "StructuredDocumentation",
"src": "118:79:10",
"src": "118:79:11",
"text": " @dev This is the interface that {BeaconProxy} expects of its beacon."
},
"fullyImplemented": false,
"id": 1239,
"id": 1314,
"linearizedBaseContracts": [
1239
1314
],
"name": "IBeacon",
"nameLocation": "208:7:10",
"nameLocation": "208:7:11",
"nodeType": "ContractDefinition",
"nodes": [
{
"documentation": {
"id": 1233,
"id": 1308,
"nodeType": "StructuredDocumentation",
"src": "222:162:10",
"src": "222:162:11",
"text": " @dev Must return an address that can be used as a delegate call target.\n {BeaconProxy} will check that this address is a contract."
},
"functionSelector": "5c60da1b",
"id": 1238,
"id": 1313,
"implemented": false,
"kind": "function",
"modifiers": [],
"name": "implementation",
"nameLocation": "398:14:10",
"nameLocation": "398:14:11",
"nodeType": "FunctionDefinition",
"parameters": {
"id": 1234,
"id": 1309,
"nodeType": "ParameterList",
"parameters": [],
"src": "412:2:10"
"src": "412:2:11"
},
"returnParameters": {
"id": 1237,
"id": 1312,
"nodeType": "ParameterList",
"parameters": [
{
"constant": false,
"id": 1236,
"id": 1311,
"mutability": "mutable",
"name": "",
"nameLocation": "-1:-1:-1",
"nodeType": "VariableDeclaration",
"scope": 1238,
"src": "438:7:10",
"scope": 1313,
"src": "438:7:11",
"stateVariable": false,
"storageLocation": "default",
"typeDescriptions": {
"typeIdentifier": "t_address",
"typeString": "address"
},
"typeName": {
"id": 1235,
"id": 1310,
"name": "address",
"nodeType": "ElementaryTypeName",
"src": "438:7:10",
"src": "438:7:11",
"stateMutability": "nonpayable",
"typeDescriptions": {
"typeIdentifier": "t_address",
Expand All @@ -122,29 +122,29 @@
"visibility": "internal"
}
],
"src": "437:9:10"
"src": "437:9:11"
},
"scope": 1239,
"src": "389:58:10",
"scope": 1314,
"src": "389:58:11",
"stateMutability": "view",
"virtual": false,
"visibility": "external"
}
],
"scope": 1240,
"src": "198:251:10",
"scope": 1315,
"src": "198:251:11",
"usedErrors": []
}
],
"src": "93:357:10"
"src": "93:357:11"
},
"compiler": {
"name": "solc",
"version": "0.8.18+commit.87f61d96.Emscripten.clang"
},
"networks": {},
"schemaVersion": "3.4.13",
"updatedAt": "2024-02-27T21:36:42.604Z",
"updatedAt": "2024-07-25T13:24:32.153Z",
"devdoc": {
"details": "This is the interface that {BeaconProxy} expects of its beacon.",
"kind": "dev",
Expand Down
56 changes: 28 additions & 28 deletions build/contracts/IERC1822Proxiable.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@
"absolutePath": "@openzeppelin/contracts/interfaces/draft-IERC1822.sol",
"exportedSymbols": {
"IERC1822Proxiable": [
822
911
]
},
"id": 823,
"id": 912,
"license": "MIT",
"nodeType": "SourceUnit",
"nodes": [
{
"id": 814,
"id": 903,
"literals": [
"solidity",
"^",
"0.8",
".0"
],
"nodeType": "PragmaDirective",
"src": "113:23:6"
"src": "113:23:7"
},
{
"abstract": false,
Expand All @@ -54,65 +54,65 @@
"contractDependencies": [],
"contractKind": "interface",
"documentation": {
"id": 815,
"id": 904,
"nodeType": "StructuredDocumentation",
"src": "138:203:6",
"src": "138:203:7",
"text": " @dev ERC1822: Universal Upgradeable Proxy Standard (UUPS) documents a method for upgradeability through a simplified\n proxy whose upgrades are fully controlled by the current implementation."
},
"fullyImplemented": false,
"id": 822,
"id": 911,
"linearizedBaseContracts": [
822
911
],
"name": "IERC1822Proxiable",
"nameLocation": "352:17:6",
"nameLocation": "352:17:7",
"nodeType": "ContractDefinition",
"nodes": [
{
"documentation": {
"id": 816,
"id": 905,
"nodeType": "StructuredDocumentation",
"src": "376:438:6",
"src": "376:438:7",
"text": " @dev Returns the storage slot that the proxiable contract assumes is being used to store the implementation\n address.\n IMPORTANT: A proxy pointing at a proxiable contract should not be considered proxiable itself, because this risks\n bricking a proxy that upgrades to it, by delegating to itself until out of gas. Thus it is critical that this\n function revert if invoked through a proxy."
},
"functionSelector": "52d1902d",
"id": 821,
"id": 910,
"implemented": false,
"kind": "function",
"modifiers": [],
"name": "proxiableUUID",
"nameLocation": "828:13:6",
"nameLocation": "828:13:7",
"nodeType": "FunctionDefinition",
"parameters": {
"id": 817,
"id": 906,
"nodeType": "ParameterList",
"parameters": [],
"src": "841:2:6"
"src": "841:2:7"
},
"returnParameters": {
"id": 820,
"id": 909,
"nodeType": "ParameterList",
"parameters": [
{
"constant": false,
"id": 819,
"id": 908,
"mutability": "mutable",
"name": "",
"nameLocation": "-1:-1:-1",
"nodeType": "VariableDeclaration",
"scope": 821,
"src": "867:7:6",
"scope": 910,
"src": "867:7:7",
"stateVariable": false,
"storageLocation": "default",
"typeDescriptions": {
"typeIdentifier": "t_bytes32",
"typeString": "bytes32"
},
"typeName": {
"id": 818,
"id": 907,
"name": "bytes32",
"nodeType": "ElementaryTypeName",
"src": "867:7:6",
"src": "867:7:7",
"typeDescriptions": {
"typeIdentifier": "t_bytes32",
"typeString": "bytes32"
Expand All @@ -121,29 +121,29 @@
"visibility": "internal"
}
],
"src": "866:9:6"
"src": "866:9:7"
},
"scope": 822,
"src": "819:57:6",
"scope": 911,
"src": "819:57:7",
"stateMutability": "view",
"virtual": false,
"visibility": "external"
}
],
"scope": 823,
"src": "342:536:6",
"scope": 912,
"src": "342:536:7",
"usedErrors": []
}
],
"src": "113:766:6"
"src": "113:766:7"
},
"compiler": {
"name": "solc",
"version": "0.8.18+commit.87f61d96.Emscripten.clang"
},
"networks": {},
"schemaVersion": "3.4.13",
"updatedAt": "2024-02-27T21:36:42.598Z",
"updatedAt": "2024-07-25T13:24:32.151Z",
"devdoc": {
"details": "ERC1822: Universal Upgradeable Proxy Standard (UUPS) documents a method for upgradeability through a simplified proxy whose upgrades are fully controlled by the current implementation.",
"kind": "dev",
Expand Down
Loading
Loading