Skip to content

Commit 1f3096e

Browse files
author
wangdong
committed
Merge branch 'master' of github.com:Loopring/protocols
2 parents dc19590 + c3a2d89 commit 1f3096e

File tree

215 files changed

+10252
-19696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+10252
-19696
lines changed

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/hebao_v1/mainnet-deployed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
| verifier2.loopring.eth | 0x6150343E0F43A17519c0327c41eDd9eBE88D01ef | loopring36 BlockVerifier |
1515
| fastwithdraw2.loopring.eth | 0xec3Cc6Cf0252565b56FC7AC396017Df5b9B78a31 | loopring36 FastWithdrawalAgent |
1616
| guardian1.loopring.eth | 0x6325d247696D39ee59Ffd931a87e022A68bbBE4f | hebao OfficialGuardian |
17+
| earn.loopring.eth | 0x1188d5175D97B4e5daF4900a3C6E31838c66C755 | loopring public wallet |
1718

1819
## Hebao V1.0.2 (2020-06-13)
1920

packages/hebao_v2/.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
node_modules
1+
# Packages
2+
node_modules/
23

3-
#Hardhat files
4-
cache
5-
artifacts
4+
# Hardhat build outputs
5+
artifacts/
6+
cache/
7+
build/

packages/hebao_v2/LICENSE

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
Business Source License 1.1
2+
3+
License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
4+
"Business Source License" is a trademark of MariaDB Corporation Ab.
5+
6+
-----------------------------------------------------------------------------
7+
8+
Parameters
9+
10+
Licensor: Loopring Technology Limited
11+
12+
Licensed Work: Loopring Smart Wallet V2
13+
The Licensed Work is (c) 2021 Loopring Technology Limited
14+
15+
Additional Use Grant: Any uses listed and defined in
16+
hebaov2.loopring.eth
17+
18+
Change Date: The earlier of 2025-01-01 or a date specified in
19+
hebaov2.loopring.eth
20+
21+
Change License: GNU General Public License v2.0 or later
22+
23+
-----------------------------------------------------------------------------
24+
25+
Terms
26+
27+
The Licensor hereby grants you the right to copy, modify, create derivative
28+
works, redistribute, and make non-production use of the Licensed Work. The
29+
Licensor may make an Additional Use Grant, above, permitting limited
30+
production use.
31+
32+
Effective on the Change Date, or the fourth anniversary of the first publicly
33+
available distribution of a specific version of the Licensed Work under this
34+
License, whichever comes first, the Licensor hereby grants you rights under
35+
the terms of the Change License, and the rights granted in the paragraph
36+
above terminate.
37+
38+
If your use of the Licensed Work does not comply with the requirements
39+
currently in effect as described in this License, you must purchase a
40+
commercial license from the Licensor, its affiliated entities, or authorized
41+
resellers, or you must refrain from using the Licensed Work.
42+
43+
All copies of the original and modified Licensed Work, and derivative works
44+
of the Licensed Work, are subject to this License. This License applies
45+
separately for each version of the Licensed Work and the Change Date may vary
46+
for each version of the Licensed Work released by Licensor.
47+
48+
You must conspicuously display this License on each original or modified copy
49+
of the Licensed Work. If you receive the Licensed Work in original or
50+
modified form from a third party, the terms and conditions set forth in this
51+
License apply to your use of that work.
52+
53+
Any use of the Licensed Work in violation of this License will automatically
54+
terminate your rights under this License for the current and all other
55+
versions of the Licensed Work.
56+
57+
This License does not grant you any right in any trademark or logo of
58+
Licensor or its affiliates (provided that you may use a trademark or logo of
59+
Licensor as expressly required by this License).
60+
61+
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
62+
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
63+
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
64+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
65+
TITLE.
66+
67+
MariaDB hereby grants you permission to use this License’s text to license
68+
your works, and to refer to it using the trademark "Business Source License",
69+
as long as you comply with the Covenants of Licensor below.
70+
71+
-----------------------------------------------------------------------------
72+
73+
Covenants of Licensor
74+
75+
In consideration of the right to use this License’s text and the "Business
76+
Source License" name and trademark, Licensor covenants to MariaDB, and to all
77+
other recipients of the licensed work to be provided by Licensor:
78+
79+
1. To specify as the Change License the GPL Version 2.0 or any later version,
80+
or a license that is compatible with GPL Version 2.0 or a later version,
81+
where "compatible" means that software provided under the Change License can
82+
be included in a program with software provided under GPL Version 2.0 or a
83+
later version. Licensor may specify additional Change Licenses without
84+
limitation.
85+
86+
2. To either: (a) specify an additional grant of rights to use that does not
87+
impose any additional restriction on the right granted in this License, as
88+
the Additional Use Grant; or (b) insert the text "None".
89+
90+
3. To specify a Change Date.
91+
92+
4. Not to modify this License in any other way.
93+
94+
-----------------------------------------------------------------------------
95+
96+
Notice
97+
98+
The Business Source License (this document, or the "License") is not an Open
99+
Source license. However, the Licensed Work will eventually be made available
100+
under an Open Source License, as stated in this License.

packages/hebao_v2/README.md

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
# Hebao V2
1+
# Hebao Smart Wallet Contracts
22

3-
## compile
3+
_[hebao]_(荷包)means wallet in China -- see https://www.pinterest.com/pin/373376625330954965 for examples.
44

5-
> npx hardhat compile
5+
# Build
6+
```
7+
yarn install
8+
yarn compile
9+
```
610

7-
## test
11+
# Run test
12+
```
13+
yarn test
14+
```
815

9-
> npx hardhat test
10-
11-
## run scripts:
12-
13-
> e.g. npx hardhat run scripts/sample-script.js
14-
15-
## INFO
16-
17-
> From Brecht: Current design is very close to a basic implementation of the Diamond Standard (EIP-2535). Quite a lot of data/discussion available for this design pattern that can be helpful for potential security issues/new ideas:
18-
19-
https://eips.ethereum.org/EIPS/eip-2535
20-
https://github.com/mudgen/Diamond
21-
ethereum/EIPs#2535
22-
https://blog.trailofbits.com/2020/10/30/good-idea-bad-design-how-the-diamond-standard-falls-short/
23-
https://dev.to/mudgen/addressing-josselin-feist-s-concern-s-of-eip-2535-diamond-standard-me8
16+
# Deploy contract to arbitrum:
17+
```
18+
npx hardhat run --network arbitrum scripts/deploy-arbitrum.ts
19+
```

packages/hebao_v2/contracts/Greeter.sol

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)