Contract Unification (#74)

* feat: scripts changed away from TokenManager
* feat: migration script
* Feat/unified withdraw and deposit (#75)
* 3.1.2
* more migration, some refactor
* 3.1.3
* 3.1.4
---------

Co-authored-by: Jesse Eisenberg <sosaucily@gmail.com>

.github/workflows/docker-build-and-push.yaml

@@ -58,7 +58,14 @@ jobs:
                   REGISTRY_ALIAS: dlc-link
                   ECR_REPOSITORY: dlc-solidity
                   IMAGE_TAG: ${{ github.ref_name }}
+                  HEAD_SHA: ${{ steps.vars.outputs.sha_short }}
               run: |
-                  docker build -t $ECR_PUBLIC_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
+                  docker build \
+                  -t $ECR_PUBLIC_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$IMAGE_TAG \
+                  -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \
+                  -t $ECR_PUBLIC_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$HEAD_SHA \
+                  -t $ECR_REGISTRY/$ECR_REPOSITORY:$HEAD_SHA .
                   docker push $ECR_PUBLIC_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$IMAGE_TAG
                   docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+                  docker push $ECR_PUBLIC_REGISTRY/$REGISTRY_ALIAS/$ECR_REPOSITORY:$HEAD_SHA
+                  docker push $ECR_REGISTRY/$ECR_REPOSITORY:$HEAD_SHA

.solcover.js

@@ -1,3 +1,4 @@
 module.exports = {
     skipFiles: ['examples', 'mocks'],
+    configureYulOptimizer: true,
 };

Dockerfile

@@ -9,7 +9,7 @@ COPY ./docker/hardhat.config.docker.js /app/dlc-solidity/hardhat.config.js
 
 WORKDIR /app/dlc-solidity
 
-RUN npm ci
+RUN npm i
 
 RUN npx hardhat compile
 

contracts/DLCLinkLibrary.sol

@@ -13,7 +13,7 @@ library DLCLink {
         FUNDED,
         CLOSING,
         CLOSED,
-        AUX_STATE_1,
+        AUX_STATE_1, // PENDING
         AUX_STATE_2,
         AUX_STATE_3,
         AUX_STATE_4,
@@ -33,5 +33,7 @@ library DLCLink {
         uint256 btcMintFeeBasisPoints;
         uint256 btcRedeemFeeBasisPoints;
         string taprootPubKey;
+        uint256 valueMinted;
+        string wdTxId;
     }
 }