Merge pull request #137 from CirclesUBI/feature-v0.3.2

Feature v0.3.2

CHANGELOG.md

@@ -4,11 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-# v0.3.1
+## latest
 
-- [PR ]
-    - temporarilly rename "Circles" to "Rings" and "CRC" to "RING", so that pre-release deployments are easily recognizable from the later production deployment
-- [PR 123] 
+- [PR132] bug fix in groupMint(); initial test coverage for group mint
+- [PR130] remove the code from the first draft proposal (December 2023)
+
+## v0.3.2
+
+- [PR129] shift migration v1-v2 to match UI time circles more accurately
+- [PR127] several of bug fixes around proxy ERC20 (and groupmint/vault), and around name registry
+
+## v0.3.1
+
+- temporarilly rename "Circles" to "Rings" and "CRC" to "RING", so that pre-release deployments are easily recognizable from the later production deployment
+- [PR125] improve deployment scripts to a workable level
+- [PR123] 
     - fix: `personalMint` should not revert if issuance is zero;
     - add `calculateIssuanceWithCheck` to know issuance without minting (while possibly updating v1 mint status);
     - add testing for simple migration and invitation flows

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/chiado-0.3.2-alpha-f06383b-240405-211207.log

@@ -0,0 +1,18 @@
+Chiado deployment
+=================
+Deployment Date: 2024-04-05 21:12:07
+Version: 0.3.2-alpha
+Git Commit: f06383b869885736d9a3b8d4e05548afa22ae879
+Deployer Address: 0x7619F26728Ced663E50E578EB6ff42430931564c, Intitial nonce: 90
+Compiler Version: v0.8.23+commit.f704f362
+
+Deployed Contracts:
+Hub: 0x33121800494cF2484887bBEac7d02ad927AC3122
+Migration: 0xcCa7c10c19A9d9b7e583C1A05A57967E62f91F8D
+NameRegistry: 0xA583a6c22D87Ac5050F94655830f78cd19f107bE
+ERC20Lift: 0xDa1AC45529226d0d465AA8fEbDF4FC37847A02fE
+StandardTreasury: 0xa1c42FDdB405375A85C8a996D4878a7B5e5d237a
+BaseGroupMintPolicy: 0x0d403dC3b0F6b07A79cb8b825a9AD824DE19b51B
+MastercopyDemurrageERC20: 0x2200542DEC6b8990E495420fA1cC19D3EEDE24FA
+MastercopyInflationaryERC20: 0xCeFf3612CD189895cdC9F8A5d8a9889b56eC1831
+MastercopyStandardVault: 0x69cF51ae876B34310FE67b75c2076471F30a4192

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/chiado-artefacts-0.3.2-alpha-f06383b-240405-211207.txt

@@ -0,0 +1,9 @@
+{"contractName":"Hub","deployedAddress":"0x33121800494cF2484887bBEac7d02ad927AC3122","sourcePath":"src/hub/Hub.sol:Hub","constructor-args":"0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0xA583a6c22D87Ac5050F94655830f78cd19f107bE 0xcCa7c10c19A9d9b7e583C1A05A57967E62f91F8D 0xDa1AC45529226d0d465AA8fEbDF4FC37847A02fE 0xa1c42FDdB405375A85C8a996D4878a7B5e5d237a 1675209600 31540000 https://fallback.aboutcircles.com/v1/circles/{id}.json","argumentsFile":"constructorArgs_Hub.txt"}
+{"contractName":"Migration","deployedAddress":"0xcCa7c10c19A9d9b7e583C1A05A57967E62f91F8D","sourcePath":"src/migration/Migration.sol:Migration","constructor-args":"0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0x33121800494cF2484887bBEac7d02ad927AC3122 1675209600","argumentsFile":"constructorArgs_Migration.txt"}
+{"contractName":"NameRegistry","deployedAddress":"0xA583a6c22D87Ac5050F94655830f78cd19f107bE","sourcePath":"src/names/NameRegistry.sol:NameRegistry","constructor-args":"0x33121800494cF2484887bBEac7d02ad927AC3122","argumentsFile":"constructorArgs_NameRegistry.txt"}
+{"contractName":"ERC20Lift","deployedAddress":"0xDa1AC45529226d0d465AA8fEbDF4FC37847A02fE","sourcePath":"src/lift/ERC20Lift.sol:ERC20Lift","constructor-args":"0x33121800494cF2484887bBEac7d02ad927AC3122 0xA583a6c22D87Ac5050F94655830f78cd19f107bE 0x2200542DEC6b8990E495420fA1cC19D3EEDE24FA 0xCeFf3612CD189895cdC9F8A5d8a9889b56eC1831","argumentsFile":"constructorArgs_ERC20Lift.txt"}
+{"contractName":"StandardTreasury","deployedAddress":"0xa1c42FDdB405375A85C8a996D4878a7B5e5d237a","sourcePath":"src/treasury/StandardTreasury.sol:StandardTreasury","constructor-args":"0x33121800494cF2484887bBEac7d02ad927AC3122 0x69cF51ae876B34310FE67b75c2076471F30a4192","argumentsFile":"constructorArgs_StandardTreasury.txt"}
+{"contractName":"BaseGroupMintPolicy","deployedAddress":"0x0d403dC3b0F6b07A79cb8b825a9AD824DE19b51B","sourcePath":"src/groups/BaseMintPolicy.sol:MintPolicy","constructor-args":"","argumentsFile":"constructorArgs_BaseGroupMintPolicy.txt"}
+{"contractName":"MastercopyDemurrageERC20","deployedAddress":"0x2200542DEC6b8990E495420fA1cC19D3EEDE24FA","sourcePath":"src/lift/DemurrageCircles.sol:DemurrageCircles","constructor-args":"","argumentsFile":"constructorArgs_MastercopyDemurrageERC20.txt"}
+{"contractName":"MastercopyInflationaryERC20","deployedAddress":"0xCeFf3612CD189895cdC9F8A5d8a9889b56eC1831","sourcePath":"src/lift/InflationaryCircles.sol:InflationaryCircles","constructor-args":"","argumentsFile":"constructorArgs_MastercopyInflationaryERC20.txt"}
+{"contractName":"MastercopyStandardVault","deployedAddress":"0x69cF51ae876B34310FE67b75c2076471F30a4192","sourcePath":"src/treasury/StandardVault.sol:StandardVault","constructor-args":"","argumentsFile":"constructorArgs_MastercopyStandardVault.txt"}

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_BaseGroupMintPolicy.txt

@@ -0,0 +1 @@
+

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_ERC20Lift.txt

@@ -0,0 +1 @@
+0x33121800494cF2484887bBEac7d02ad927AC3122 0xA583a6c22D87Ac5050F94655830f78cd19f107bE 0x2200542DEC6b8990E495420fA1cC19D3EEDE24FA 0xCeFf3612CD189895cdC9F8A5d8a9889b56eC1831

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_Hub.txt

@@ -0,0 +1 @@
+0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0xA583a6c22D87Ac5050F94655830f78cd19f107bE 0xcCa7c10c19A9d9b7e583C1A05A57967E62f91F8D 0xDa1AC45529226d0d465AA8fEbDF4FC37847A02fE 0xa1c42FDdB405375A85C8a996D4878a7B5e5d237a 1675209600 31540000 https://fallback.aboutcircles.com/v1/circles/{id}.json

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_MastercopyDemurrageERC20.txt

@@ -0,0 +1 @@
+

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_MastercopyInflationaryERC20.txt

@@ -0,0 +1 @@
+

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_MastercopyStandardVault.txt

@@ -0,0 +1 @@
+

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_Migration.txt

@@ -0,0 +1 @@
+0xdbF22D4e8962Db3b2F1d9Ff55be728A887e47710 0x33121800494cF2484887bBEac7d02ad927AC3122 1675209600

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_NameRegistry.txt

@@ -0,0 +1 @@
+0x33121800494cF2484887bBEac7d02ad927AC3122

script/deployments/chiado-0.3.2-alpha-f06383b-240405-211207/constructorArgs_StandardTreasury.txt

@@ -0,0 +1 @@
+0x33121800494cF2484887bBEac7d02ad927AC3122 0x69cF51ae876B34310FE67b75c2076471F30a4192

script/deployments/chiadoDeploy.sh

@@ -137,7 +137,7 @@ HUB=$(deploy_and_store_details "Hub" $HUB_ADDRESS_01 \
 
 MIGRATION=$(deploy_and_store_details "Migration" $MIGRATION_ADDRESS_02 \
   src/migration/Migration.sol:Migration \
-  --constructor-args $V1_HUB_ADDRESS $HUB_ADDRESS_01)
+  --constructor-args $V1_HUB_ADDRESS $HUB_ADDRESS_01 $INFLATION_DAY_ZERO)
 
 NAME_REGISTRY=$(deploy_and_store_details "NameRegistry" $NAMEREGISTRY_ADDRESS_03 \
   src/names/NameRegistry.sol:NameRegistry \

script/deployments/gnosisChainDeploy.sh

@@ -166,7 +166,7 @@ NONCE_USED=$((NONCE_USED + 1))
 
 MIGRATION=$(deploy_and_store_details "Migration" $MIGRATION_ADDRESS_02 \
   src/migration/Migration.sol:Migration $((NONCE_USED)) \
-  --constructor-args $V1_HUB_ADDRESS $HUB_ADDRESS_01)
+  --constructor-args $V1_HUB_ADDRESS $HUB_ADDRESS_01 $INFLATION_DAY_ZERO)
 
 NONCE_USED=$((NONCE_USED + 1))
 

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_BaseGroupMintPolicy.txt

@@ -0,0 +1 @@
+

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_ERC20Lift.txt

@@ -0,0 +1 @@
+0x466D13BF31a19cF4d42C6D396905AC82653dAFC4 0xa2995166b75E0a6bB4883Eeb485A69DDaABA10D8 0x67449A1E0ef68B489134CBFb34Dc69F0ED652288 0x3e9887631218a26fc800F21652DC95bC21308b37

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_Hub.txt

@@ -0,0 +1 @@
+0x29b9a7fBb8995b2423a71cC17cf9810798F6C543 0xa2995166b75E0a6bB4883Eeb485A69DDaABA10D8 0x98c25c0619e63ba58ffC4489790a2df957Cd048B 0xEDF830D970EAaE91a2C82bDe34414f6735bBad2d 0x70e02a1655930338AD08E629C6A6Fd9DB6da067a 1602720000 31540000 https://fallback.aboutcircles.com/v1/circles/{id}.json

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_MastercopyDemurrageERC20.txt

@@ -0,0 +1 @@
+

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_MastercopyInflationaryERC20.txt

@@ -0,0 +1 @@
+

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_MastercopyStandardVault.txt

@@ -0,0 +1 @@
+

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_Migration.txt

@@ -0,0 +1 @@
+0x29b9a7fBb8995b2423a71cC17cf9810798F6C543 0x466D13BF31a19cF4d42C6D396905AC82653dAFC4 1602720000

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_NameRegistry.txt

@@ -0,0 +1 @@
+0x466D13BF31a19cF4d42C6D396905AC82653dAFC4

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/constructorArgs_StandardTreasury.txt

@@ -0,0 +1 @@
+0x466D13BF31a19cF4d42C6D396905AC82653dAFC4 0x76d413192EA230569059d341797D2dab2B6d4f08

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/gnosischain-0.3.2-alpha-f06383b-240405-211831.log

@@ -0,0 +1,18 @@
+Gnosis Chain deployment
+=================
+Deployment Date: 2024-04-05 21:18:31
+Version: 0.3.2-alpha
+Git Commit: f06383b869885736d9a3b8d4e05548afa22ae879
+Deployer Address: 0x7619F26728Ced663E50E578EB6ff42430931564c, Initial nonce: 29
+Compiler Version: v0.8.23+commit.f704f362
+
+Deployed Contracts:
+Hub: 0x466D13BF31a19cF4d42C6D396905AC82653dAFC4
+Migration: 0x98c25c0619e63ba58ffC4489790a2df957Cd048B
+NameRegistry: 0xa2995166b75E0a6bB4883Eeb485A69DDaABA10D8
+ERC20Lift: 0xEDF830D970EAaE91a2C82bDe34414f6735bBad2d
+StandardTreasury: 0x70e02a1655930338AD08E629C6A6Fd9DB6da067a
+BaseGroupMintPolicy: 0xfA17268a07D514b7ddb158a226c15bb53Dc99DEc
+MastercopyDemurrageERC20: 0x67449A1E0ef68B489134CBFb34Dc69F0ED652288
+MastercopyInflationaryERC20: 0x3e9887631218a26fc800F21652DC95bC21308b37
+MastercopyStandardVault: 0x76d413192EA230569059d341797D2dab2B6d4f08

script/deployments/gnosischain-0.3.2-alpha-f06383b-240405-211831/gnosischain-artefacts-0.3.2-alpha-f06383b-240405-211831.txt

@@ -0,0 +1,9 @@
+{"contractName":"Hub","deployedAddress":"0x466D13BF31a19cF4d42C6D396905AC82653dAFC4","sourcePath":"src/hub/Hub.sol:Hub","constructor-args":"0x29b9a7fBb8995b2423a71cC17cf9810798F6C543 0xa2995166b75E0a6bB4883Eeb485A69DDaABA10D8 0x98c25c0619e63ba58ffC4489790a2df957Cd048B 0xEDF830D970EAaE91a2C82bDe34414f6735bBad2d 0x70e02a1655930338AD08E629C6A6Fd9DB6da067a 1602720000 31540000 https://fallback.aboutcircles.com/v1/circles/{id}.json","argumentsFile":"constructorArgs_Hub.txt"}
+{"contractName":"Migration","deployedAddress":"0x98c25c0619e63ba58ffC4489790a2df957Cd048B","sourcePath":"src/migration/Migration.sol:Migration","constructor-args":"0x29b9a7fBb8995b2423a71cC17cf9810798F6C543 0x466D13BF31a19cF4d42C6D396905AC82653dAFC4 1602720000","argumentsFile":"constructorArgs_Migration.txt"}
+{"contractName":"NameRegistry","deployedAddress":"0xa2995166b75E0a6bB4883Eeb485A69DDaABA10D8","sourcePath":"src/names/NameRegistry.sol:NameRegistry","constructor-args":"0x466D13BF31a19cF4d42C6D396905AC82653dAFC4","argumentsFile":"constructorArgs_NameRegistry.txt"}
+{"contractName":"ERC20Lift","deployedAddress":"0xEDF830D970EAaE91a2C82bDe34414f6735bBad2d","sourcePath":"src/lift/ERC20Lift.sol:ERC20Lift","constructor-args":"0x466D13BF31a19cF4d42C6D396905AC82653dAFC4 0xa2995166b75E0a6bB4883Eeb485A69DDaABA10D8 0x67449A1E0ef68B489134CBFb34Dc69F0ED652288 0x3e9887631218a26fc800F21652DC95bC21308b37","argumentsFile":"constructorArgs_ERC20Lift.txt"}
+{"contractName":"StandardTreasury","deployedAddress":"0x70e02a1655930338AD08E629C6A6Fd9DB6da067a","sourcePath":"src/treasury/StandardTreasury.sol:StandardTreasury","constructor-args":"0x466D13BF31a19cF4d42C6D396905AC82653dAFC4 0x76d413192EA230569059d341797D2dab2B6d4f08","argumentsFile":"constructorArgs_StandardTreasury.txt"}
+{"contractName":"BaseGroupMintPolicy","deployedAddress":"0xfA17268a07D514b7ddb158a226c15bb53Dc99DEc","sourcePath":"src/groups/BaseMintPolicy.sol:MintPolicy","constructor-args":"","argumentsFile":"constructorArgs_BaseGroupMintPolicy.txt"}
+{"contractName":"MastercopyDemurrageERC20","deployedAddress":"0x67449A1E0ef68B489134CBFb34Dc69F0ED652288","sourcePath":"src/lift/DemurrageCircles.sol:DemurrageCircles","constructor-args":"","argumentsFile":"constructorArgs_MastercopyDemurrageERC20.txt"}
+{"contractName":"MastercopyInflationaryERC20","deployedAddress":"0x3e9887631218a26fc800F21652DC95bC21308b37","sourcePath":"src/lift/InflationaryCircles.sol:InflationaryCircles","constructor-args":"","argumentsFile":"constructorArgs_MastercopyInflationaryERC20.txt"}
+{"contractName":"MastercopyStandardVault","deployedAddress":"0x76d413192EA230569059d341797D2dab2B6d4f08","sourcePath":"src/treasury/StandardVault.sol:StandardVault","constructor-args":"","argumentsFile":"constructorArgs_MastercopyStandardVault.txt"}

script/deployments/package.json

@@ -1,6 +1,6 @@
 {
     "name": "deploy-circles",
-    "version": "0.3.1-alpha",
+    "version": "0.3.2-alpha",
     "type": "module",
     "dependencies": {
         "dotenv": "^16.4.5",