Skip to content

Commit 4c0d5a5

Browse files
jaensenjaensen
authored
Merge pull request #145 from CirclesUBI/20240417-uri-with-ipfsv0
20240417 base58 shortnames; resolve IPFS metadata
2 parents f17bb8f + b37a433 commit 4c0d5a5

24 files changed

+430
-125
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## latest
8+
9+
- [PR141] consented flow with bi-directional trust, with opt-out to v1 protocol of uni-directional trust
10+
- [PR138] storage-based reentrency guard for operateFlowMatrix
11+
- [PR136] total supply, name and symbol for ERC1155 (out of specification)
12+
713
## v0.3.3
814

915
- [PR132] bug fix in groupMint(); initial test coverage for group mint

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/chiado-0.3.3-alpha-7b78c74-240412-151200.log

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Chiado deployment
2+
=================
3+
Deployment Date: 2024-04-12 15:12:00
4+
Version: 0.3.3-alpha
5+
Git Commit: 7b78c749b91175265f2cf934fcc4f51a2085358d
6+
Deployer Address: 0x7619F26728Ced663E50E578EB6ff42430931564c, Intitial nonce: 108
7+
Compiler Version: v0.8.23+commit.f704f362
8+
9+
Deployed Contracts:
10+
Hub: 0xFFfbD3E62203B888bb8E09c1fcAcE58242674964
11+
Migration: 0x9c7E2AfAc052743944d5d8F80Db90E1E14A663aE
12+
NameRegistry: 0x0A1D308a39A6dF8972A972E586E4b4b3Dc73520f
13+
ERC20Lift: 0xaA20efff0511175C091F156D095DD3b62951Be48
14+
StandardTreasury: 0x97c28CCC374570C2b10f7569197919418D702F99
15+
BaseGroupMintPolicy: 0x95fbD8D52c18b6AA453e9cB06851543f125DCedE
16+
MastercopyDemurrageERC20: 0x44A47EC79B45A13e884328018320D90DE86Bb932
17+
MastercopyInflationaryERC20: 0xb4A1012a0564a25dF5a8311d1B6DF47b098BdfdB
18+
MastercopyStandardVault: 0x8E0115358DC2Dc984c0C1d9530BEE19616492177

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/chiado-artefacts-0.3.3-alpha-7b78c74-240412-151200.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{"contractName":"Hub","deployedAddress":"0xFFfbD3E62203B888bb8E09c1fcAcE58242674964","sourcePath":"src/hub/Hub.sol:Hub","constructor-args":"0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0x0A1D308a39A6dF8972A972E586E4b4b3Dc73520f 0x9c7E2AfAc052743944d5d8F80Db90E1E14A663aE 0xaA20efff0511175C091F156D095DD3b62951Be48 0x97c28CCC374570C2b10f7569197919418D702F99 1675209600 31540000 https://fallback.aboutcircles.com/v1/circles/{id}.json","argumentsFile":"constructorArgs_Hub.txt"}
2+
{"contractName":"Migration","deployedAddress":"0x9c7E2AfAc052743944d5d8F80Db90E1E14A663aE","sourcePath":"src/migration/Migration.sol:Migration","constructor-args":"0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0xFFfbD3E62203B888bb8E09c1fcAcE58242674964 1675209600","argumentsFile":"constructorArgs_Migration.txt"}
3+
{"contractName":"NameRegistry","deployedAddress":"0x0A1D308a39A6dF8972A972E586E4b4b3Dc73520f","sourcePath":"src/names/NameRegistry.sol:NameRegistry","constructor-args":"0xFFfbD3E62203B888bb8E09c1fcAcE58242674964","argumentsFile":"constructorArgs_NameRegistry.txt"}
4+
{"contractName":"ERC20Lift","deployedAddress":"0xaA20efff0511175C091F156D095DD3b62951Be48","sourcePath":"src/lift/ERC20Lift.sol:ERC20Lift","constructor-args":"0xFFfbD3E62203B888bb8E09c1fcAcE58242674964 0x0A1D308a39A6dF8972A972E586E4b4b3Dc73520f 0x44A47EC79B45A13e884328018320D90DE86Bb932 0xb4A1012a0564a25dF5a8311d1B6DF47b098BdfdB","argumentsFile":"constructorArgs_ERC20Lift.txt"}
5+
{"contractName":"StandardTreasury","deployedAddress":"0x97c28CCC374570C2b10f7569197919418D702F99","sourcePath":"src/treasury/StandardTreasury.sol:StandardTreasury","constructor-args":"0xFFfbD3E62203B888bb8E09c1fcAcE58242674964 0x8E0115358DC2Dc984c0C1d9530BEE19616492177","argumentsFile":"constructorArgs_StandardTreasury.txt"}
6+
{"contractName":"BaseGroupMintPolicy","deployedAddress":"0x95fbD8D52c18b6AA453e9cB06851543f125DCedE","sourcePath":"src/groups/BaseMintPolicy.sol:MintPolicy","constructor-args":"","argumentsFile":"constructorArgs_BaseGroupMintPolicy.txt"}
7+
{"contractName":"MastercopyDemurrageERC20","deployedAddress":"0x44A47EC79B45A13e884328018320D90DE86Bb932","sourcePath":"src/lift/DemurrageCircles.sol:DemurrageCircles","constructor-args":"","argumentsFile":"constructorArgs_MastercopyDemurrageERC20.txt"}
8+
{"contractName":"MastercopyInflationaryERC20","deployedAddress":"0xb4A1012a0564a25dF5a8311d1B6DF47b098BdfdB","sourcePath":"src/lift/InflationaryCircles.sol:InflationaryCircles","constructor-args":"","argumentsFile":"constructorArgs_MastercopyInflationaryERC20.txt"}
9+
{"contractName":"MastercopyStandardVault","deployedAddress":"0x8E0115358DC2Dc984c0C1d9530BEE19616492177","sourcePath":"src/treasury/StandardVault.sol:StandardVault","constructor-args":"","argumentsFile":"constructorArgs_MastercopyStandardVault.txt"}

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_BaseGroupMintPolicy.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_ERC20Lift.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0xFFfbD3E62203B888bb8E09c1fcAcE58242674964 0x0A1D308a39A6dF8972A972E586E4b4b3Dc73520f 0x44A47EC79B45A13e884328018320D90DE86Bb932 0xb4A1012a0564a25dF5a8311d1B6DF47b098BdfdB

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_Hub.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0x0A1D308a39A6dF8972A972E586E4b4b3Dc73520f 0x9c7E2AfAc052743944d5d8F80Db90E1E14A663aE 0xaA20efff0511175C091F156D095DD3b62951Be48 0x97c28CCC374570C2b10f7569197919418D702F99 1675209600 31540000 https://fallback.aboutcircles.com/v1/circles/{id}.json

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_MastercopyDemurrageERC20.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_MastercopyInflationaryERC20.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_MastercopyStandardVault.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎script/deployments/chiado-0.3.3-alpha-7b78c74-240412-151200/constructorArgs_Migration.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0xFFfbD3E62203B888bb8E09c1fcAcE58242674964 1675209600

0 commit comments

Comments
 (0)