Add fd callback for initial authentication

WIP
2025-03-21 15:07:54 +02:00 · 2025-03-21 13:53:37 +02:00
714 changed files with 25304 additions and 77615 deletions
@@ -1,2 +1 @@
 nym-validator-rewarder/.sqlx/** diff=nodiff
-nym-node-status-api/nym-node-status-api/.sqlx/** diff=nodiff
@@ -9,7 +9,7 @@
      "version": "1.0.0",
      "dependencies": {
        "@actions/core": "^1.10.1",
-        "@actions/github": "^6.0.0",
+        "@actions/github": "^5.1.1",
        "@octokit/auth-action": "^4.0.1",
        "@octokit/rest": "^20.0.2",
        "hasha": "^5.2.0",
@@ -29,34 +29,22 @@
      }
    },
    "node_modules/@actions/github": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.0.tgz",
-      "integrity": "sha512-alScpSVnYmjNEXboZjarjukQEzgCRmjMv6Xj47fsdnqGS73bjJNDpiiXmp8jr0UZLdUB6d9jW63IcmddUP+l0g==",
-      "license": "MIT",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-5.1.1.tgz",
+      "integrity": "sha512-Nk59rMDoJaV+mHCOJPXuvB1zIbomlKS0dmSIqPGxd0enAXBnOfn4VWF+CGtRCwXZG9Epa54tZA7VIRlJDS8A6g==",
      "dependencies": {
-        "@actions/http-client": "^2.2.0",
-        "@octokit/core": "^5.0.1",
-        "@octokit/plugin-paginate-rest": "^9.0.0",
-        "@octokit/plugin-rest-endpoint-methods": "^10.0.0"
+        "@actions/http-client": "^2.0.1",
+        "@octokit/core": "^3.6.0",
+        "@octokit/plugin-paginate-rest": "^2.17.0",
+        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
      }
    },
    "node_modules/@actions/http-client": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
-      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
-      "license": "MIT",
-      "dependencies": {
-        "tunnel": "^0.0.6",
-        "undici": "^5.25.4"
-      }
-    },
-    "node_modules/@fastify/busboy": {
      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
-      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14"
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
+      "integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
      }
    },
    "node_modules/@octokit/auth-action": {
@@ -71,6 +59,14 @@
        "node": ">= 18"
      }
    },
+    "node_modules/@octokit/auth-action/node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
    "node_modules/@octokit/auth-action/node_modules/@octokit/openapi-types": {
      "version": "20.0.0",
      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
@@ -85,152 +81,115 @@
      }
    },
    "node_modules/@octokit/auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
+      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "dependencies": {
+        "@octokit/types": "^6.0.3"
      }
    },
    "node_modules/@octokit/core": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.0.tgz",
-      "integrity": "sha512-1LFfa/qnMQvEOAdzlQymH0ulepxbxnCYAKJZfMci/5XJyIHWgEYnDmgnKakbTh7CH2tFQ5O60oYDvns4i9RAIg==",
-      "license": "MIT",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
      "dependencies": {
-        "@octokit/auth-token": "^4.0.0",
-        "@octokit/graphql": "^7.1.0",
-        "@octokit/request": "^8.3.1",
-        "@octokit/request-error": "^5.1.0",
-        "@octokit/types": "^13.0.0",
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
        "before-after-hook": "^2.2.0",
        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
      }
    },
    "node_modules/@octokit/endpoint": {
-      "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
-      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
-      "license": "MIT",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
+      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
      "dependencies": {
-        "@octokit/types": "^13.1.0",
+        "@octokit/types": "^6.0.3",
+        "is-plain-object": "^5.0.0",
        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
      }
    },
    "node_modules/@octokit/graphql": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.0.tgz",
-      "integrity": "sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==",
-      "license": "MIT",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
+      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
      "dependencies": {
-        "@octokit/request": "^8.3.0",
-        "@octokit/types": "^13.0.0",
+        "@octokit/request": "^5.6.0",
+        "@octokit/types": "^6.0.3",
        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
      }
    },
    "node_modules/@octokit/openapi-types": {
-      "version": "23.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz",
-      "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==",
-      "license": "MIT"
+      "version": "12.11.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz",
+      "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="
    },
    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
-      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
-      "license": "MIT",
+      "version": "2.21.3",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz",
+      "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==",
      "dependencies": {
-        "@octokit/types": "^12.6.0"
-      },
-      "engines": {
-        "node": ">= 18"
+        "@octokit/types": "^6.40.0"
      },
      "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/core": ">=2"
      }
    },
    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
-      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
-      "license": "MIT",
+      "version": "5.16.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz",
+      "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==",
      "dependencies": {
-        "@octokit/types": "^12.6.0"
-      },
-      "engines": {
-        "node": ">= 18"
+        "@octokit/types": "^6.39.0",
+        "deprecation": "^2.3.1"
      },
      "peerDependencies": {
-        "@octokit/core": "5"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
-      "version": "20.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
-      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
-      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^20.0.0"
+        "@octokit/core": ">=3"
      }
    },
    "node_modules/@octokit/request": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
-      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
-      "license": "MIT",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
      "dependencies": {
-        "@octokit/endpoint": "^9.0.6",
-        "@octokit/request-error": "^5.1.1",
-        "@octokit/types": "^13.1.0",
+        "@octokit/endpoint": "^6.0.1",
+        "@octokit/request-error": "^2.1.0",
+        "@octokit/types": "^6.16.1",
+        "is-plain-object": "^5.0.0",
+        "node-fetch": "^2.6.7",
        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
      }
    },
    "node_modules/@octokit/request-error": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
-      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
-      "license": "MIT",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
+      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
      "dependencies": {
-        "@octokit/types": "^13.1.0",
+        "@octokit/types": "^6.0.3",
        "deprecation": "^2.0.0",
        "once": "^1.4.0"
+      }
+    },
+    "node_modules/@octokit/request/node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
      },
      "engines": {
-        "node": ">= 18"
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
      }
    },
    "node_modules/@octokit/rest": {
@@ -247,6 +206,89 @@
        "node": ">= 18"
      }
    },
+    "node_modules/@octokit/rest/node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/core": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.0.tgz",
+      "integrity": "sha512-YbAtMWIrbZ9FCXbLwT9wWB8TyLjq9mxpKdgB3dUNxQcIVTf9hJ70gRPwAcqGZdY6WdJPZ0I7jLaaNDCiloGN2A==",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.0.0",
+        "@octokit/request": "^8.0.2",
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^11.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/endpoint": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.0.tgz",
+      "integrity": "sha512-szrQhiqJ88gghWY2Htt8MqUDO6++E/EIXqJ2ZEp5ma3uGS46o7LZAzSLt49myB7rT+Hfw5Y6gO3LmOxGzHijAQ==",
+      "dependencies": {
+        "@octokit/types": "^11.0.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/graphql": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.0.1.tgz",
+      "integrity": "sha512-T5S3oZ1JOE58gom6MIcrgwZXzTaxRnxBso58xhozxHpOqSTgDS6YNeEUvZ/kRvXgPrRz/KHnZhtb7jUMRi9E6w==",
+      "dependencies": {
+        "@octokit/request": "^8.0.1",
+        "@octokit/types": "^11.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/openapi-types": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-18.0.0.tgz",
+      "integrity": "sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw=="
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.1.tgz",
+      "integrity": "sha512-wfGhE/TAkXZRLjksFXuDZdmGnJQHvtU/joFQdweXUgzo1XwvBCD4o4+75NtFfjfLK5IwLf9vHTfSiU3sLRYpRw==",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
    "node_modules/@octokit/rest/node_modules/@octokit/plugin-request-log": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.0.tgz",
@@ -258,13 +300,75 @@
        "@octokit/core": ">=5"
      }
    },
-    "node_modules/@octokit/types": {
-      "version": "13.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.8.0.tgz",
-      "integrity": "sha512-x7DjTIbEpEWXK99DMd01QfWy0hd5h4EN+Q7shkdKds3otGQP+oWE/y0A76i1OvH9fygo4ddvNf7ZvF0t78P98A==",
-      "license": "MIT",
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
      "dependencies": {
-        "@octokit/openapi-types": "^23.0.1"
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA=="
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/request": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.1.tgz",
+      "integrity": "sha512-8N+tdUz4aCqQmXl8FpHYfKG9GelDFd7XGVzyN8rc6WxVlYcfpHECnuRkgquzz+WzvHTK62co5di8gSXnzASZPQ==",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.0",
+        "@octokit/request-error": "^5.0.0",
+        "@octokit/types": "^11.1.0",
+        "is-plain-object": "^5.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/request-error": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.0.0.tgz",
+      "integrity": "sha512-1ue0DH0Lif5iEqT52+Rf/hf0RmGO9NWFjrzmrkArpG9trFfDM/efx00BJHdLGuro4BR/gECxCU2Twf5OKrRFsQ==",
+      "dependencies": {
+        "@octokit/types": "^11.0.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/types": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-11.1.0.tgz",
+      "integrity": "sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==",
+      "dependencies": {
+        "@octokit/openapi-types": "^18.0.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.41.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz",
+      "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==",
+      "dependencies": {
+        "@octokit/openapi-types": "^12.11.0"
      }
    },
    "node_modules/@vercel/ncc": {
@@ -292,8 +396,7 @@
    "node_modules/deprecation": {
      "version": "2.3.1",
      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-      "license": "ISC"
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="
    },
    "node_modules/fetch-blob": {
      "version": "3.2.0",
@@ -343,6 +446,14 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/is-stream": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -393,11 +504,15 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "license": "ISC",
      "dependencies": {
        "wrappy": "1"
      }
    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
    "node_modules/tunnel": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -414,18 +529,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/undici": {
-      "version": "5.28.5",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.5.tgz",
-      "integrity": "sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@fastify/busboy": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.0"
-      }
-    },
    "node_modules/universal-user-agent": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
@@ -447,11 +550,24 @@
        "node": ">= 8"
      }
    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
    "node_modules/wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "license": "ISC"
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
    }
  }
 }
@@ -11,7 +11,7 @@
  },
  "dependencies": {
    "@actions/core": "^1.10.1",
-    "@actions/github": "^6.0.0",
+    "@actions/github": "^5.1.1",
    "@octokit/auth-action": "^4.0.1",
    "@octokit/rest": "^20.0.2",
    "hasha": "^5.2.0",
@@ -27,12 +27,6 @@ on:
      - '.github/workflows/ci-build.yml'
  workflow_dispatch:

-concurrency:
-  # only 1 concurrent `ci-build` allowed per branch
-  # https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#example-using-concurrency-and-the-default-behavior
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  build:
    strategy:
@@ -1,57 +0,0 @@
-name: ci-check-ns-api-version
-
-on:
-  pull_request:
-    paths:
-      - "nym-node-status-api/**"
-
-env:
-  WORKING_DIRECTORY: "nym-node-status-api/nym-node-status-api"
-
-jobs:
-  check-if-tag-exists:
-    runs-on: arc-ubuntu-22.04-dind
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Get version from cargo.toml
-        uses: mikefarah/yq@v4.45.1
-        id: get_version
-        with:
-          cmd: yq -oy '.package.version' ${{ env.WORKING_DIRECTORY }}/Cargo.toml
-
-      - name: Check if git tag exists
-        run: |
-          TAG=${{ env.WORKING_DIRECTORY }}-${{ steps.get_version.outputs.result }}
-          if [[ -z "$TAG" ]]; then
-            echo "Tag is empty"
-            exit 1
-          fi
-          git ls-remote --tags origin | awk '{print $2}'
-          if git ls-remote --tags origin | awk '{print $2}' | grep -q "refs/tags/$TAG$" ; then
-              echo "Tag '$TAG' ALREADY EXISTS on the remote"
-              exit 1
-          else
-              echo "Tag '$TAG' does not exist on the remote"
-          fi
-      - name: Check if harbor tag exists
-        run: |
-          TAG=${{ steps.get_version.outputs.result }}
-          registry=https://harbor.nymte.ch
-          repo_name=nym/node-status-api
-          if [[ -z $TAG ]]; then
-            echo "Tag is empty"
-            exit 1
-          fi
-          curl -su ${{ secrets.HARBOR_ROBOT_USERNAME }}:${{ secrets.HARBOR_ROBOT_SECRET }} "$registry/v2/$repo_name/tags/list" | jq
-          exists=$(curl -su ${{ secrets.HARBOR_ROBOT_USERNAME }}:${{ secrets.HARBOR_ROBOT_SECRET }} "$registry/v2/$repo_name/tags/list" | jq --arg tag $TAG '.tags | contains([$tag])' )
-          if [[ $exists = "true" ]]; then
-            echo "Version '$TAG' defined in Cargo.toml ALREADY EXISTS as tag in harbor repo"
-            exit 1
-          elif [[ $exists = "false" ]]; then
-            echo "Version '$TAG' doesn't exist on the remote"
-          else
-            echo "Unknown output '$exists'"
-            exit 1
-          fi
@@ -0,0 +1,6 @@
+[
+  {
+    "rust":"stable",
+    "runOnEvent":"always"
+  }
+]
@@ -31,6 +31,7 @@ jobs:
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
+          toolchain: 1.77
          target: wasm32-unknown-unknown
          override: true

@@ -39,9 +40,6 @@ jobs:
        with:
          version: '114'

-      - name: Install cosmwasm-check
-        run: cargo install cosmwasm-check
-
      - name: Build release contracts
        run: make contracts

@@ -52,6 +50,7 @@ jobs:
        run: |
          cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/vesting_contract.wasm $OUTPUT_DIR
+          cp contracts/target/wasm32-unknown-unknown/release/nym_coconut_bandwidth.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/nym_coconut_dkg.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw3_flex_multisig.wasm $OUTPUT_DIR
          cp contracts/target/wasm32-unknown-unknown/release/cw4_group.wasm $OUTPUT_DIR
@@ -14,12 +14,28 @@ on:
      - '.github/workflows/ci-contracts.yml'

 jobs:
+  matrix_prep:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      # creates the matrix strategy from ci-contracts-matrix-includes.json
+      - uses: actions/checkout@v4
+      - id: set-matrix
+        uses: JoshuaTheMiller/conditional-build-matrix@main
+        with:
+          inputFile: '.github/workflows/ci-contracts-matrix-includes.json'
+          filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
  build:
    # since it's going to be compiled into wasm, there's absolutely
    # no point in running CI on different OS-es
    runs-on: ubuntu-20.04
    env:
      CARGO_TERM_COLOR: always
+    needs: matrix_prep
+    strategy:
+      fail-fast: false
+      matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
    steps:
      - uses: actions/checkout@v4

@@ -27,19 +43,11 @@ jobs:
        uses: actions-rs/toolchain@v1
        with:
          profile: minimal
-          toolchain: stable
+          toolchain: ${{ matrix.rust }}
          target: wasm32-unknown-unknown
          override: true
          components: rustfmt, clippy

-      - name: Install cosmwasm-check
-        run: cargo install cosmwasm-check
-
-      - name: Install wasm-opt
-        uses: ./.github/actions/install-wasm-opt
-        with:
-          version: '114'
-
      - name: Build contracts
        uses: actions-rs/cargo@v1
        env:
@@ -65,7 +73,3 @@ jobs:
        with:
          command: clippy
          args: --lib --manifest-path contracts/Cargo.toml --workspace --all-targets -- -D warnings
-
-      - name: Check chain compatibility against release build
-        # this will build contracts in release mode, run wasm-opt and finally cosmwasm-check
-        run: make contracts
@@ -11,8 +11,6 @@ on:
 jobs:
  build:
    runs-on: arc-ubuntu-20.04
-    env:
-      RUSTUP_PERMIT_COPY_RENAME: 1
    defaults:
      run:
        working-directory: documentation/docs
@@ -16,8 +16,6 @@ on:
 jobs:
  build:
    runs-on: arc-ubuntu-20.04
-    env:
-      RUSTUP_PERMIT_COPY_RENAME: 1
    steps:
      - uses: actions/checkout@v4
      - uses: rlespinasse/github-slug-action@v3.x
@@ -44,7 +42,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.23.7"
+          go-version: '1.20'

      - name: Install
        run: yarn
@@ -14,7 +14,6 @@ jobs:
    runs-on: arc-ubuntu-20.04
    env:
      CARGO_TERM_COLOR: always
-      RUSTUP_PERMIT_COPY_RENAME: 1
    steps:
      - name: Install Dependencies (Linux)
        run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools
@@ -10,66 +10,66 @@ jobs:
  build:
    runs-on: custom-linux
    steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4

-      - name: Install rsync
-        run: sudo apt-get install rsync
-        continue-on-error: true
+    - name: Install rsync
+      run: sudo apt-get install rsync
+      continue-on-error: true

-      - uses: rlespinasse/github-slug-action@v3.x
+    - uses: rlespinasse/github-slug-action@v3.x

-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 18

-      - name: Setup yarn
-        run: npm install -g yarn
+    - name: Setup yarn
+      run: npm install -g yarn

-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
+    - name: Install Rust stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable

-      - name: Install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

-      - name: Build dependencies
-        run: yarn && yarn build
+    - name: Build dependencies
+      run: yarn && yarn build

-      - name: Build storybook
-        run: yarn storybook:build
-        working-directory: ./nym-wallet
+    - name: Build storybook
+      run: yarn storybook:build
+      working-directory: ./nym-wallet

-      - name: Deploy branch to CI www (storybook)
-        continue-on-error: true
-        uses: easingthemes/ssh-deploy@main
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
-          ARGS: "-rltgoDzvO --delete"
-          SOURCE: "nym-wallet/storybook-static/"
-          REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
-          REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
-          TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }}
-          EXCLUDE: "/dist/, /node_modules/"
+    - name: Deploy branch to CI www (storybook)
+      continue-on-error: true
+      uses: easingthemes/ssh-deploy@main
+      env:
+        SSH_PRIVATE_KEY: ${{ secrets.CI_WWW_SSH_PRIVATE_KEY }}
+        ARGS: "-rltgoDzvO --delete"
+        SOURCE: "nym-wallet/storybook-static/"
+        REMOTE_HOST: ${{ secrets.CI_WWW_REMOTE_HOST }}
+        REMOTE_USER: ${{ secrets.CI_WWW_REMOTE_USER }}
+        TARGET: ${{ secrets.CI_WWW_REMOTE_TARGET }}/wallet-${{ env.GITHUB_REF_SLUG }}
+        EXCLUDE: "/dist/, /node_modules/"

-      - name: Matrix - Node Install
-        run: npm install
-        working-directory: .github/workflows/support-files
+    - name: Matrix - Node Install
+      run: npm install
+      working-directory: .github/workflows/support-files

-      - name: Matrix - Send Notification
-        env:
-          NYM_NOTIFICATION_KIND: nym-wallet
-          NYM_PROJECT_NAME: "nym-wallet"
-          NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
-          NYM_CI_WWW_LOCATION: "wallet-${{ env.GITHUB_REF_SLUG }}"
-          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "${GITHUB_REF##*/}"
-          IS_SUCCESS: "${{ job.status == 'success' }}"
-          MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
-          MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
-          MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
-          MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
-          MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
-        uses: docker://keybaseio/client:stable-node
-        with:
-          args: .github/workflows/support-files/notifications/entry_point.sh
+    - name: Matrix - Send Notification
+      env:
+        NYM_NOTIFICATION_KIND: nym-wallet
+        NYM_PROJECT_NAME: "nym-wallet"
+        NYM_CI_WWW_BASE: "${{ secrets.NYM_CI_WWW_BASE }}"
+        NYM_CI_WWW_LOCATION: "wallet-${{ env.GITHUB_REF_SLUG }}"
+        GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
+        GIT_BRANCH: "${GITHUB_REF##*/}"
+        IS_SUCCESS: "${{ job.status == 'success' }}"
+        MATRIX_SERVER: "${{ secrets.MATRIX_SERVER }}"
+        MATRIX_ROOM: "${{ secrets.MATRIX_ROOM }}"
+        MATRIX_USER_ID: "${{ secrets.MATRIX_USER_ID }}"
+        MATRIX_TOKEN: "${{ secrets.MATRIX_TOKEN }}"
+        MATRIX_DEVICE_ID: "${{ secrets.MATRIX_DEVICE_ID }}"
+      uses: docker://keybaseio/client:stable-node
+      with:
+        args: .github/workflows/support-files/notifications/entry_point.sh
@@ -14,7 +14,6 @@ jobs:
    runs-on: arc-ubuntu-20.04
    env:
      CARGO_TERM_COLOR: always
-      RUSTUP_PERMIT_COPY_RENAME: 1
    steps:
      - uses: actions/checkout@v4

@@ -33,7 +32,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.23.7"
+          go-version: '1.20'

      - name: Install wasm-pack
        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
@@ -2,18 +2,19 @@ name: publish-nym-contracts
 on:
  workflow_dispatch:
  release:
-    types: [ created ]
+    types: [created]

 jobs:
  build:
    if: ${{ (startsWith(github.ref, 'refs/tags/nym-contracts-') && github.event_name == 'release') || github.event_name == 'workflow_dispatch' }}
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, custom-ubuntu-20.04]
    steps:
      - uses: actions/checkout@v4

      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
+          toolchain: 1.77
          target: wasm32-unknown-unknown
          override: true

@@ -14,7 +14,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        platform: [macos-15]
+        platform: [macos-12-large]
    runs-on: ${{ matrix.platform }}

    outputs:
@@ -30,7 +30,7 @@ jobs:
      - name: Node
        uses: actions/setup-node@v4
        with:
-          node-version: 21
+          node-version: 18
      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
        with:
@@ -36,7 +36,7 @@ jobs:
      - name: Node
        uses: actions/setup-node@v4
        with:
-          node-version: 21
+          node-version: 18

      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -49,7 +49,7 @@ jobs:
      - name: Node
        uses: actions/setup-node@v4
        with:
-          node-version: 21
+          node-version: 18

      - name: Install Rust stable
        uses: actions-rs/toolchain@v1
@@ -49,7 +49,7 @@ jobs:
            "build-tools;$SDK_BUILDTOOLS_VERSION"

      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.100.0
+        uses: dtolnay/rust-toolchain@1.90.0

      - name: Install rust android targets
        run: |
@@ -31,7 +31,12 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: "1.23.7"
+          go-version: "1.20"
+
+      - name: Install TinyGo
+        uses: acifani/setup-tinygo@v2
+        with:
+          tinygo-version: "0.27.0"

      - name: Install dependencies
        run: yarn
@@ -4,180 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [Unreleased]

-## [2025.6-chuckles] (2025-03-31)
-
- Remove Google public DNS ([#5660])
- Revert using AsyncWrite sink in IPR ([#5656])
- Add fd callback for initial authentication ([#5654])
- Add concurrency limit to CI ([#5651])
- Remove UNIQUE constraint on node pubkey ([#5649])
- Add RUSTUP_PERMIT_COPY_RENAME in two workflows that we forgot about ([#5646])
- Upgrade sha2 to workspace version for validator-client ([#5644])
- Add max_retransmissions flag on each message ([#5642])
- build(deps): bump zip from 2.2.2 to 2.4.1 ([#5639])
- build(deps): bump dtolnay/rust-toolchain from 1.90.0 to 1.100.0 ([#5638])
- / regenerated yarn.lock ([#5636])
- Rework IPR codec to extract out timer and implement AsyncWrite ([#5632])
- build(deps): bump tempfile from 3.18.0 to 3.19.0 ([#5631])
- build(deps): bump zeroize from 1.6.0 to 1.8.1 ([#5630])
- build(deps): bump once_cell from 1.20.3 to 1.21.1 ([#5629])
- build(deps): bump uuid from 1.15.1 to 1.16.0 ([#5628])
- build(deps): bump celes from 2.5.0 to 2.6.0 ([#5627])
- build(deps): bump http from 1.2.0 to 1.3.1 ([#5626])
- build(deps): bump humantime from 2.1.0 to 2.2.0 ([#5625])
- build(deps): bump the patch-updates group with 8 updates ([#5624])
- build(deps): bump @babel/runtime from 7.16.3 to 7.26.10 in /testnet-faucet ([#5621])
- Feature/paginated ticketbooks challenge ([#5619])
- build(deps-dev): bump webpack from 5.77.0 to 5.98.0 in /wasm/client/internal-dev ([#5615])
- build(deps-dev): bump ws from 8.13.0 to 8.18.1 in /wasm/client/internal-dev ([#5614])
- build(deps): bump golang.org/x/net from 0.23.0 to 0.36.0 in /wasm/mix-fetch/go-mix-conn ([#5613])
- build(deps): bump braces from 3.0.2 to 3.0.3 in /sdk/typescript/packages/mix-fetch-node ([#5612])
- Wireguard exit policies (and tests) ([#5557])
- Explorer V2 ([#5548])
- Clean stale partially received buffers ([#5536])
- Corrected typos ([#5497])
- build(deps): bump @octokit/plugin-paginate-rest and @actions/github in /.github/actions/nym-hash-releases/src ([#5488])
- feature: upgrade cosmwasm to 2.2 ([#5479])
- build(deps): bump store2 from 2.14.3 to 2.14.4 ([#5391])
- build(deps): bump nanoid from 3.3.7 to 3.3.8 in /documentation/docs ([#5335])
- build(deps): bump next from 13.5.7 to 14.2.15 in /documentation/docs ([#5281])
- Bump http-proxy-middleware from 2.0.6 to 2.0.7 ([#5019])
-
-[#5660]: https://github.com/nymtech/nym/pull/5660
-[#5656]: https://github.com/nymtech/nym/pull/5656
-[#5654]: https://github.com/nymtech/nym/pull/5654
-[#5651]: https://github.com/nymtech/nym/pull/5651
-[#5649]: https://github.com/nymtech/nym/pull/5649
-[#5646]: https://github.com/nymtech/nym/pull/5646
-[#5644]: https://github.com/nymtech/nym/pull/5644
-[#5642]: https://github.com/nymtech/nym/pull/5642
-[#5639]: https://github.com/nymtech/nym/pull/5639
-[#5638]: https://github.com/nymtech/nym/pull/5638
-[#5636]: https://github.com/nymtech/nym/pull/5636
-[#5632]: https://github.com/nymtech/nym/pull/5632
-[#5631]: https://github.com/nymtech/nym/pull/5631
-[#5630]: https://github.com/nymtech/nym/pull/5630
-[#5629]: https://github.com/nymtech/nym/pull/5629
-[#5628]: https://github.com/nymtech/nym/pull/5628
-[#5627]: https://github.com/nymtech/nym/pull/5627
-[#5626]: https://github.com/nymtech/nym/pull/5626
-[#5625]: https://github.com/nymtech/nym/pull/5625
-[#5624]: https://github.com/nymtech/nym/pull/5624
-[#5621]: https://github.com/nymtech/nym/pull/5621
-[#5619]: https://github.com/nymtech/nym/pull/5619
-[#5615]: https://github.com/nymtech/nym/pull/5615
-[#5614]: https://github.com/nymtech/nym/pull/5614
-[#5613]: https://github.com/nymtech/nym/pull/5613
-[#5612]: https://github.com/nymtech/nym/pull/5612
-[#5557]: https://github.com/nymtech/nym/pull/5557
-[#5548]: https://github.com/nymtech/nym/pull/5548
-[#5536]: https://github.com/nymtech/nym/pull/5536
-[#5497]: https://github.com/nymtech/nym/pull/5497
-[#5488]: https://github.com/nymtech/nym/pull/5488
-[#5479]: https://github.com/nymtech/nym/pull/5479
-[#5391]: https://github.com/nymtech/nym/pull/5391
-[#5335]: https://github.com/nymtech/nym/pull/5335
-[#5281]: https://github.com/nymtech/nym/pull/5281
-[#5019]: https://github.com/nymtech/nym/pull/5019
-
-## [2025.5-chokito] (2025-03-18)
-
- build(deps): bump braces from 3.0.2 to 3.0.3 in /sdk/typescript/packages/nodejs-client ([#5611])
- build(deps-dev): bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /wasm/client/internal-dev ([#5610])
- Export lane queue lengths in sdk ([#5609])
- Chore/more payment watcher debug endpoints ([#5608])
- build(deps): bump @babel/helpers from 7.24.4 to 7.26.10 ([#5606])
- Chore/update bls12 381 fork ([#5605])
- chore: change auth v2 timestamp skew and allow values from the future ([#5604])
- Chore/payment watcher debug endpoints ([#5601])
- Allow resetting all SURB sender tags ([#5600])
- introduce internal tool for checking signer status ([#5598])
- build(deps-dev): bump webpack from 5.77.0 to 5.98.0 in /wasm/mix-fetch/internal-dev ([#5597])
- build(deps): bump body-parser and express in /wasm/mix-fetch/internal-dev ([#5596])
- build(deps): bump serve-static and express in /wasm/mix-fetch/internal-dev ([#5594])
- build(deps-dev): bump ws from 8.13.0 to 8.18.1 in /wasm/mix-fetch/internal-dev ([#5593])
- build(deps): bump cookie and express in /wasm/client/internal-dev ([#5592])
- build(deps): bump cookie and express in /wasm/mix-fetch/internal-dev ([#5591])
- build(deps): bump braces from 3.0.2 to 3.0.3 in /wasm/zknym-lib/internal-dev ([#5590])
- build(deps): bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /wasm/zknym-lib/internal-dev ([#5589])
- build(deps): bump tempfile from 3.17.1 to 3.18.0 ([#5588])
- build(deps): bump tokio from 1.43.0 to 1.44.0 ([#5587])
- build(deps): bump the patch-updates group with 8 updates ([#5585])
- build(deps): bump ring from 0.17.9 to 0.17.13 ([#5583])
- delete double memo field in send modal ([#5578])
- Server Side internal DoT/DoH opt out ([#5577])
- Rust SDK SURB example: change hardcoded file to tempdir ([#5576])
- Add /v3/nym-nodes ([#5569])
- chore: start sending v2 sphinx packets ([#5554])
- build(deps): bump the patch-updates group across 1 directory with 14 updates ([#5549])
- build(deps): bump uuid from 1.13.2 to 1.15.1 ([#5542])
- build(deps): bump rs_merkle from 1.4.2 to 1.5.0 ([#5541])
- feature: v2 authentication request ([#5537])
- Set RUSTUP_PERMIT_COPY_RENAME ([#5533])
- feature: disallow routing mix packets to nodes not present in the topology ([#5526])
- Make "Memo" visible per default on send NYM ([#5524])
- feat: make sure any terminated task kills the watcher and write run info to db ([#5517])
- Another total_stake SQL fix ([#5516])
- Fix total_stake on SQL update ([#5514])
- build(deps): bump flate2 from 1.0.35 to 1.1.0 ([#5510])
- build(deps): bump itertools from 0.13.0 to 0.14.0 ([#5509])
- build(deps): bump the patch-updates group with 2 updates ([#5505])
- Treat gateways as Nym Nodes ([#5504])
- Update version in Cargo.toml ([#5503])
- feat: use ct_eq for checking bearer token ([#5501])
- Add extra args for the probe ([#5499])
- Fix stats bug & remove HM caching ([#5495])
- fix: Cargo.lock for contracts ([#5489])
- Display error messages if IPv4 or IPv6 address not found on nymtun0 ([#5465])
-
-[#5611]: https://github.com/nymtech/nym/pull/5611
-[#5610]: https://github.com/nymtech/nym/pull/5610
-[#5609]: https://github.com/nymtech/nym/pull/5609
-[#5608]: https://github.com/nymtech/nym/pull/5608
-[#5606]: https://github.com/nymtech/nym/pull/5606
-[#5605]: https://github.com/nymtech/nym/pull/5605
-[#5604]: https://github.com/nymtech/nym/pull/5604
-[#5601]: https://github.com/nymtech/nym/pull/5601
-[#5600]: https://github.com/nymtech/nym/pull/5600
-[#5598]: https://github.com/nymtech/nym/pull/5598
-[#5597]: https://github.com/nymtech/nym/pull/5597
-[#5596]: https://github.com/nymtech/nym/pull/5596
-[#5594]: https://github.com/nymtech/nym/pull/5594
-[#5593]: https://github.com/nymtech/nym/pull/5593
-[#5592]: https://github.com/nymtech/nym/pull/5592
-[#5591]: https://github.com/nymtech/nym/pull/5591
-[#5590]: https://github.com/nymtech/nym/pull/5590
-[#5589]: https://github.com/nymtech/nym/pull/5589
-[#5588]: https://github.com/nymtech/nym/pull/5588
-[#5587]: https://github.com/nymtech/nym/pull/5587
-[#5585]: https://github.com/nymtech/nym/pull/5585
-[#5583]: https://github.com/nymtech/nym/pull/5583
-[#5578]: https://github.com/nymtech/nym/pull/5578
-[#5577]: https://github.com/nymtech/nym/pull/5577
-[#5576]: https://github.com/nymtech/nym/pull/5576
-[#5569]: https://github.com/nymtech/nym/pull/5569
-[#5554]: https://github.com/nymtech/nym/pull/5554
-[#5549]: https://github.com/nymtech/nym/pull/5549
-[#5542]: https://github.com/nymtech/nym/pull/5542
-[#5541]: https://github.com/nymtech/nym/pull/5541
-[#5537]: https://github.com/nymtech/nym/pull/5537
-[#5533]: https://github.com/nymtech/nym/pull/5533
-[#5526]: https://github.com/nymtech/nym/pull/5526
-[#5524]: https://github.com/nymtech/nym/pull/5524
-[#5517]: https://github.com/nymtech/nym/pull/5517
-[#5516]: https://github.com/nymtech/nym/pull/5516
-[#5514]: https://github.com/nymtech/nym/pull/5514
-[#5510]: https://github.com/nymtech/nym/pull/5510
-[#5509]: https://github.com/nymtech/nym/pull/5509
-[#5505]: https://github.com/nymtech/nym/pull/5505
-[#5504]: https://github.com/nymtech/nym/pull/5504
-[#5503]: https://github.com/nymtech/nym/pull/5503
-[#5501]: https://github.com/nymtech/nym/pull/5501
-[#5499]: https://github.com/nymtech/nym/pull/5499
-[#5495]: https://github.com/nymtech/nym/pull/5495
-[#5489]: https://github.com/nymtech/nym/pull/5489
-[#5465]: https://github.com/nymtech/nym/pull/5465
-
 ## [2025.4-dorina-patched] (2025-03-06)

 - use legacy crypto for constructing SURB headers ([#5579])
@@ -334,7 +160,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Downgrade harmless log message from info to debug ([#5403])
 - Redirect from mixnode page to nodes page ([#5397])
 - chore :update version of chain watcher and validator rewarder ([#5394])
- bugfix: correctly handle ignore epoch roles flag ([#5390])
+- bugfix: correctly handle ingore epoch roles flag ([#5390])
 - bugfix: terminate mixnet socket listener on shutdown ([#5389])
 - feat: make client ignore dual mode nodes by default ([#5388])
 - Handle ecash network errors differently ([#5378])
@@ -355,7 +181,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Use expect in geodata test to give error message on failure ([#5314])
 - feature: periodically remove stale gateway messages ([#5312])
 - build(deps): bump the patch-updates group across 1 directory with 35 updates ([#5310])
- Add dependabot assigns for the root cargo ecosystem ([#5297])
+- Add dependabot assignes for the root cargo ecosystem ([#5297])
 - Move tun constants to network defaults ([#5286])
 - Include IPINFO_API_TOKEN in nightly CI ([#5285])
 - Nyx Chain Watcher ([#5274])
@@ -408,7 +234,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [2025.1-reeses] (2025-01-15)

- Feature, Future/legacy alert ([#5346])
+- Feture/legacy alert ([#5346])
 - chore: readjusted --mode behaviour to fix the regression ([#5331])
 - chore: apply 1.84 linter suggestions ([#5330])
 - bugfix: make sure refresh data key matches bond info ([#5329])
@@ -488,7 +314,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://

 ## [2024.14-crunch-patched] (2024-12-17)

- Fixes an issue to allow previously registered clients to connect to latest nym-nodes
+- Fixes an issue to allow previously registred clients to connect to latest nym-nodes
 - Fixes compatibility issues between nym-nodes and older clients

 ## [2024.14-crunch] (2024-12-11)
@@ -496,7 +322,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Merge/release/2024.14-crunch ([#5242])
 - bugfix: added explicit openapi servers to account for route prefixes ([#5237])
 - Further config score adjustments ([#5225])
- feature: remove any filtering on node semver ([#5224])
+- feature: remve any filtering on node semver ([#5224])
 - Backport #5218 ([#5220])
 - Derive serialize for UserAgent (#5210) ([#5217])
 - dont consider legacy nodes for rewarded set selection ([#5215])
@@ -675,7 +501,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - bugfix/feature: added NymApiClient method to get all skimmed nodes ([#5062])
 - Merge1/release/2024.13 magura ([#5061])
 - added hacky routes to return nymnodes alongside legacy nodes ([#5051])
- bugfix: mark migrated gateways as rewarded in the previous epoch in case they're, their, there in the rewarded set ([#5049])
+- bugfix: mark migrated gateways as rewarded in the previous epoch in case theyre in the rewarded set ([#5049])
 - bugfix: adjust runtime storage migration ([#5047])
 - bugfix: supersede 'cb13be27f8f61d9ae74d924e85d2e6787895eb14' by using… ([#5046])
 - bugfix: restore default http port for nym-api ([#5045])
@@ -736,7 +562,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Fix broken build after merge ([#4937])
 - bugfix: correctly paginate through 'search_tx' endpoint ([#4936])
 - Add more conversions for responses of authenticator messages ([#4929])
- Directory Services, Devices v2.1 ([#4903])
+- Directory Sevices v2.1 ([#4903])
 - Migrate Legacy Node (Frontend)  ([#4826])
 - Fix critical issues SI84 and SI85 from Cure53 ([#4758])

@@ -1120,7 +946,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Remove stale peers ([#4640])
 - Add generic wg private network routing ([#4636])
 - Feature/new node endpoints ([#4635])
- standardised ContractBuildInformation and added it to all contracts ([#4631])
+- standarised ContractBuildInformation and added it to all contracts ([#4631])
 - validate nym-node public ips on startup ([#4630])
 - Bump defguard wg ([#4625])
 - Fix cargo warnings ([#4624])
@@ -1741,7 +1567,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - clean-up nym-api startup arguments/flags to use clap 3 and its macro-derived arguments ([#2772])
 - renamed all references to validator_api to nym_api
 - renamed all references to nymd to nyxd ([#2696])
- all-binaries: standardised argument names (note: old names should still be accepted) ([#2762]
+- all-binaries: standarised argument names (note: old names should still be accepted) ([#2762]

 ### Fixed

@@ -2246,7 +2072,7 @@ The release also include some additional work for distributed key generation in
 - Explorer UI tests missing data-testid [\#903](https://github.com/nymtech/nym/pull/903) ([tommyv1987](https://github.com/tommyv1987))
 - Fix up Nym-Wallet README.md [\#899](https://github.com/nymtech/nym/pull/899) ([tommyv1987](https://github.com/tommyv1987))
 - Feature/batch delegator rewarding [\#898](https://github.com/nymtech/nym/pull/898) ([jstuczyn](https://github.com/jstuczyn))
- Bug map nodemap [\#897](https://github.com/nymtech/nym/pull/897) ([Aid19801](https://github.com/Aid19801))
+- Bug mapp nodemap [\#897](https://github.com/nymtech/nym/pull/897) ([Aid19801](https://github.com/Aid19801))
 - Bug fix/macos keyboard shortcuts [\#896](https://github.com/nymtech/nym/pull/896) ([fmtabbara](https://github.com/fmtabbara))
 - Add a Mobile Nav to the Network Explorer [\#895](https://github.com/nymtech/nym/pull/895) ([Aid19801](https://github.com/Aid19801))
 - Only use ts-rs in tests [\#894](https://github.com/nymtech/nym/pull/894) ([durch](https://github.com/durch))
@@ -32,8 +32,9 @@ members = [
    "common/client-libs/validator-client",
    "common/commands",
    "common/config",
+    "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
    "common/cosmwasm-smart-contracts/coconut-dkg",
-    "common/cosmwasm-smart-contracts/contracts-common", "common/cosmwasm-smart-contracts/easy_addr",
+    "common/cosmwasm-smart-contracts/contracts-common",
    "common/cosmwasm-smart-contracts/ecash-contract",
    "common/cosmwasm-smart-contracts/group-contract",
    "common/cosmwasm-smart-contracts/mixnet-contract",
@@ -97,9 +98,9 @@ members = [
    "common/wireguard",
    "common/wireguard-types",
    "documentation/autodoc",
-    # "explorer-api",
-    # "explorer-api/explorer-api-requests",
-    # "explorer-api/explorer-client",
+    "explorer-api",
+    "explorer-api/explorer-api-requests",
+    "explorer-api/explorer-client",
    "gateway",
    "integrations/bity",
    "nym-api",
@@ -152,6 +153,7 @@ members = [
 default-members = [
    "clients/native",
    "clients/socks5",
+    "explorer-api",
    "nym-api",
    "nym-credential-proxy/nym-credential-proxy",
    "nym-node",
@@ -192,7 +194,7 @@ ammonia = "4"
 anyhow = "1.0.97"
 arc-swap = "1.7.1"
 argon2 = "0.5.0"
-async-trait = "0.1.88"
+async-trait = "0.1.87"
 axum = "0.7.5"
 axum-client-ip = "0.6.1"
 axum-extra = "0.9.4"
@@ -209,13 +211,13 @@ bs58 = "0.5.1"
 bytecodec = "0.4.15"
 bytes = "1.10.1"
 cargo_metadata = "0.18.1"
-celes = "2.6.0"
+celes = "2.5.0"
 cfg-if = "1.0.0"
 chacha20 = "0.9.0"
 chacha20poly1305 = "0.10.1"
 chrono = "0.4.40"
 cipher = "0.4.3"
-clap = "4.5.32"
+clap = "4.5.31"
 clap_complete = "4.5"
 clap_complete_fig = "4.5"
 colored = "2.2"
@@ -240,7 +242,7 @@ dotenvy = "0.15.6"
 ecdsa = "0.16"
 ed25519-dalek = "2.1"
 encoding_rs = "0.8.35"
-env_logger = "0.11.7"
+env_logger = "0.11.6"
 envy = "0.4"
 etherparse = "0.13.0"
 eyre = "0.6.9"
@@ -262,7 +264,7 @@ http = "1"
 http-body-util = "0.1"
 httpcodec = "0.2.3"
 human-repr = "1.1.0"
-humantime = "2.2.0"
+humantime = "2.1.0"
 humantime-serde = "1.1.1"
 hyper = "1.6.0"
 hyper-util = "0.1"
@@ -283,7 +285,7 @@ moka = { version = "0.12", features = ["future"] }
 nix = "0.27.1"
 notify = "5.1.0"
 okapi = "0.7.0"
-once_cell = "1.21.1"
+once_cell = "1.20.3"
 opentelemetry = "0.19.0"
 opentelemetry-jaeger = "0.18.0"
 parking_lot = "0.12.3"
@@ -329,7 +331,7 @@ syn = "1"
 sysinfo = "0.33.0"
 tap = "1.0.1"
 tar = "0.4.44"
-tempfile = "3.19"
+tempfile = "3.18"
 thiserror = "2.0"
 time = "0.3.39"
 tokio = "1.44"
@@ -338,7 +340,7 @@ tokio-stream = "0.1.17"
 tokio-test = "0.4.4"
 tokio-tun = "0.11.5"
 tokio-tungstenite = { version = "0.20.1" }
-tokio-util = "0.7.14"
+tokio-util = "0.7.13"
 toml = "0.8.20"
 tower = "0.5.2"
 tower-http = "0.5.2"
@@ -360,7 +362,7 @@ vergen = { version = "=8.3.1", default-features = false }
 walkdir = "2"
 wasm-bindgen-test = "0.3.49"
 x25519-dalek = "2.0.0"
-zeroize = "1.7.0"
+zeroize = "1.6.0"

 prometheus = { version = "0.13.0" }

@@ -374,18 +376,19 @@ ff = { version = "0.13.1", default-features = false }
 subtle = "2.5.0"

 # cosmwasm-related
-cosmwasm-schema = "=2.2.2"
-cosmwasm-std = "=2.2.2"
-# use 1.0.1 as that's the version used by cosmwasm-std 2.2.1
+cosmwasm-schema = "=1.4.3"
+cosmwasm-std = "=1.4.3"
+# use 0.5.0 as that's the version used by cosmwasm-std 1.4.3
 # (and ideally we don't want to pull the same dependency twice)
-serde-json-wasm = "=1.0.1"
+serde-json-wasm = "=0.5.0"
+cosmwasm-storage = "=1.4.3"
 # same version as used by cosmwasm
-cw-utils = "=2.0.0"
-cw-storage-plus = "=2.0.0"
-cw2 = { version = "=2.0.0" }
-cw3 = { version = "=2.0.0" }
-cw4 = { version = "=2.0.0" }
-cw-controllers = { version = "=2.0.0" }
+cw-utils = "=1.0.1"
+cw-storage-plus = "=1.2.0"
+cw2 = { version = "=1.1.2" }
+cw3 = { version = "=1.1.2" }
+cw4 = { version = "=1.1.2" }
+cw-controllers = { version = "=1.1.0" }

 # cosmrs-related
 bip32 = { version = "0.5.3", default-features = false }
@@ -400,7 +403,7 @@ prost = { version = "0.13", default-features = false }
 gloo-utils = "0.2.0"
 gloo-net = "0.6.0"

-indexed_db_futures = "0.6.1"
+indexed_db_futures = "0.6.0"
 js-sys = "0.3.76"
 serde-wasm-bindgen = "0.6.5"
 tsify = "0.4.5"
@@ -133,22 +133,17 @@ clippy: sdk-wasm-lint
 # Build contracts ready for deploy
 # -----------------------------------------------------------------------------

-CONTRACTS=vesting_contract mixnet_contract nym_ecash cw3_flex_multisig cw4_group nym_coconut_dkg
+CONTRACTS=vesting_contract mixnet_contract nym_ecash
 CONTRACTS_WASM=$(addsuffix .wasm, $(CONTRACTS))
 CONTRACTS_OUT_DIR=contracts/target/wasm32-unknown-unknown/release

-contracts: build-release-contracts wasm-opt-contracts cosmwasm-check-contracts
+contracts: build-release-contracts wasm-opt-contracts

 wasm-opt-contracts:
 	for contract in $(CONTRACTS_WASM); do \
 	  wasm-opt --signext-lowering -Os $(CONTRACTS_OUT_DIR)/$$contract -o $(CONTRACTS_OUT_DIR)/$$contract; \
 	done

-cosmwasm-check-contracts:
-	for contract in $(CONTRACTS_WASM); do \
-	  cosmwasm-check $(CONTRACTS_OUT_DIR)/$$contract; \
-	done
-
 # Consider adding 's' to make plural consistent (beware: used in github workflow)
 contract-schema:
 	$(MAKE) -C contracts schema
@@ -157,9 +152,18 @@ contract-schema:
 # Convenience targets for crates that are already part of the main workspace
 # -----------------------------------------------------------------------------

+build-explorer-api:
+	cargo build -p explorer-api
+
 build-nym-cli:
 	cargo build -p nym-cli --release

+build-nym-gateway:
+	cargo build -p nym-gateway --release
+
+build-nym-mixnode:
+	cargo build -p nym-mixnode --release
+
 # -----------------------------------------------------------------------------
 # Misc
 # -----------------------------------------------------------------------------
@@ -172,7 +176,13 @@ run-api-tests:
 	cd nym-api/tests/functional_test && yarn test:qa

 # Build debian package, and update PPA
+deb-mixnode: build-nym-mixnode
+	cargo deb -p nym-mixnode 
+
+deb-gateway: build-nym-gateway
+	cargo deb -p nym-gateway
+
 deb-cli: build-nym-cli
 	cargo deb -p nym-cli

-deb: deb-cli
+deb: deb-mixnode deb-gateway deb-cli
@@ -67,13 +67,3 @@ As a general approach, licensing is as follows this pattern:
 - documentation is Apache 2.0 or CC0-1.0

 Nym Node Operators and Validators Terms and Conditions can be found [here](https://nym.com/operators-validators-terms).
-
-## Getting Started
-
-```bash
-yarn install
-```
-
-```bash
-yarn build
-```
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.52"
+version = "1.1.51"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.52"
+version = "1.1.51"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"
@@ -28,7 +28,6 @@ pub enum InputMessage {
        recipient: Recipient,
        data: Vec<u8>,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    },

    /// Creates a message used for a duplex anonymous communication where the recipient
@@ -44,7 +43,6 @@ pub enum InputMessage {
        data: Vec<u8>,
        reply_surbs: u32,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    },

    /// Attempt to use our internally received and stored `ReplySurb` to send the message back
@@ -55,7 +53,6 @@ pub enum InputMessage {
        recipient_tag: AnonymousSenderTag,
        data: Vec<u8>,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    },

    MessageWrapper {
@@ -95,7 +92,6 @@ impl InputMessage {
            recipient,
            data,
            lane,
-            max_retransmissions: None,
        };
        if let Some(packet_type) = packet_type {
            InputMessage::new_wrapper(message, packet_type)
@@ -116,7 +112,28 @@ impl InputMessage {
            data,
            reply_surbs,
            lane,
-            max_retransmissions: None,
+        };
+        if let Some(packet_type) = packet_type {
+            InputMessage::new_wrapper(message, packet_type)
+        } else {
+            message
+        }
+    }
+
+    // IMHO `new_anonymous` should take `mix_hops: Option<u8>` as an argument instead of creating
+    // this function, but that would potentially break backwards compatibility with the current API
+    pub fn new_anonymous_with_custom_hops(
+        recipient: Recipient,
+        data: Vec<u8>,
+        reply_surbs: u32,
+        lane: TransmissionLane,
+        packet_type: Option<PacketType>,
+    ) -> Self {
+        let message = InputMessage::Anonymous {
+            recipient,
+            data,
+            reply_surbs,
+            lane,
        };
        if let Some(packet_type) = packet_type {
            InputMessage::new_wrapper(message, packet_type)
@@ -135,7 +152,6 @@ impl InputMessage {
            recipient_tag,
            data,
            lane,
-            max_retransmissions: None,
        };
        if let Some(packet_type) = packet_type {
            InputMessage::new_wrapper(message, packet_type)
@@ -153,34 +169,4 @@ impl InputMessage {
            InputMessage::MessageWrapper { message, .. } => message.lane(),
        }
    }
-
-    pub fn set_max_retransmissions(&mut self, max_retransmissions: u32) -> &mut Self {
-        match self {
-            InputMessage::Regular {
-                max_retransmissions: m,
-                ..
-            }
-            | InputMessage::Anonymous {
-                max_retransmissions: m,
-                ..
-            }
-            | InputMessage::Reply {
-                max_retransmissions: m,
-                ..
-            } => {
-                *m = Some(max_retransmissions);
-            }
-            InputMessage::Premade { .. } => {}
-            InputMessage::MessageWrapper { message, .. } => {
-                message.set_max_retransmissions(max_retransmissions);
-            }
-        }
-
-        self
-    }
-
-    pub fn with_max_retransmissions(mut self, max_retransmissions: u32) -> Self {
-        self.set_max_retransmissions(max_retransmissions);
-        self
-    }
 }
@@ -52,7 +52,7 @@ impl MixTrafficController {
        let (message_sender, message_receiver) =
            tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);

-        let (client_sender, client_receiver) = tokio::sync::mpsc::channel(8);
+        let (client_sender, client_receiver) = tokio::sync::mpsc::channel(1);

        (
            MixTrafficController {
@@ -77,7 +77,7 @@ impl MixTrafficController {
    ) {
        let (message_sender, message_receiver) =
            tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);
-        let (client_sender, client_receiver) = tokio::sync::mpsc::channel(8);
+        let (client_sender, client_receiver) = tokio::sync::mpsc::channel(1);
        (
            MixTrafficController {
                gateway_transceiver,
@@ -222,6 +222,9 @@ impl ActionController {

    // note: when the entry expires it's automatically removed from pending_acks_timers
    fn handle_expired_ack_timer(&mut self, expired_ack: Expired<FragmentIdentifier>) {
+        // I'm honestly not sure how to handle it, because getting it means other things in our
+        // system are already misbehaving. If we ever see this panic, then I guess we should worry
+        // about it. Perhaps just reschedule it at later point?
        let frag_id = expired_ack.into_inner();

        trace!("{frag_id} has expired");
@@ -65,12 +65,11 @@ where
        recipient_tag: AnonymousSenderTag,
        data: Vec<u8>,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    ) {
        // offload reply handling to the dedicated task
-        if let Err(err) =
-            self.reply_controller_sender
-                .send_reply(recipient_tag, data, lane, max_retransmissions)
+        if let Err(err) = self
+            .reply_controller_sender
+            .send_reply(recipient_tag, data, lane)
        {
            if !self.task_client.is_shutdown_poll() {
                error!("failed to send a reply - {err}");
@@ -84,11 +83,10 @@ where
        content: Vec<u8>,
        lane: TransmissionLane,
        packet_type: PacketType,
-        max_retransmissions: Option<u32>,
    ) {
        if let Err(err) = self
            .message_handler
-            .try_send_plain_message(recipient, content, lane, packet_type, max_retransmissions)
+            .try_send_plain_message(recipient, content, lane, packet_type)
            .await
        {
            warn!("failed to send a plain message - {err}")
@@ -102,18 +100,10 @@ where
        reply_surbs: u32,
        lane: TransmissionLane,
        packet_type: PacketType,
-        max_retransmissions: Option<u32>,
    ) {
        if let Err(err) = self
            .message_handler
-            .try_send_message_with_reply_surbs(
-                recipient,
-                content,
-                reply_surbs,
-                lane,
-                packet_type,
-                max_retransmissions,
-            )
+            .try_send_message_with_reply_surbs(recipient, content, reply_surbs, lane, packet_type)
            .await
        {
            warn!("failed to send a repliable message - {err}")
@@ -126,42 +116,25 @@ where
                recipient,
                data,
                lane,
-                max_retransmissions,
            } => {
-                self.handle_plain_message(
-                    recipient,
-                    data,
-                    lane,
-                    PacketType::Mix,
-                    max_retransmissions,
-                )
-                .await
+                self.handle_plain_message(recipient, data, lane, PacketType::Mix)
+                    .await
            }
            InputMessage::Anonymous {
                recipient,
                data,
                reply_surbs,
                lane,
-                max_retransmissions,
            } => {
-                self.handle_repliable_message(
-                    recipient,
-                    data,
-                    reply_surbs,
-                    lane,
-                    PacketType::Mix,
-                    max_retransmissions,
-                )
-                .await
+                self.handle_repliable_message(recipient, data, reply_surbs, lane, PacketType::Mix)
+                    .await
            }
            InputMessage::Reply {
                recipient_tag,
                data,
                lane,
-                max_retransmissions,
            } => {
-                self.handle_reply(recipient_tag, data, lane, max_retransmissions)
-                    .await;
+                self.handle_reply(recipient_tag, data, lane).await;
            }
            InputMessage::Premade { msgs, lane } => self.handle_premade_packets(msgs, lane).await,
            InputMessage::MessageWrapper {
@@ -172,42 +145,25 @@ where
                    recipient,
                    data,
                    lane,
-                    max_retransmissions,
                } => {
-                    self.handle_plain_message(
-                        recipient,
-                        data,
-                        lane,
-                        packet_type,
-                        max_retransmissions,
-                    )
-                    .await
+                    self.handle_plain_message(recipient, data, lane, packet_type)
+                        .await
                }
                InputMessage::Anonymous {
                    recipient,
                    data,
                    reply_surbs,
                    lane,
-                    max_retransmissions,
                } => {
-                    self.handle_repliable_message(
-                        recipient,
-                        data,
-                        reply_surbs,
-                        lane,
-                        packet_type,
-                        max_retransmissions,
-                    )
-                    .await
+                    self.handle_repliable_message(recipient, data, reply_surbs, lane, packet_type)
+                        .await
                }
                InputMessage::Reply {
                    recipient_tag,
                    data,
                    lane,
-                    max_retransmissions,
                } => {
-                    self.handle_reply(recipient_tag, data, lane, max_retransmissions)
-                        .await;
+                    self.handle_reply(recipient_tag, data, lane).await;
                }
                InputMessage::Premade { msgs, lane } => {
                    self.handle_premade_packets(msgs, lane).await
@@ -72,7 +72,6 @@ pub struct PendingAcknowledgement {
    delay: SphinxDelay,
    destination: PacketDestination,
    retransmissions: u32,
-    max_retransmissions: Option<u32>,
 }

 impl PendingAcknowledgement {
@@ -81,14 +80,12 @@ impl PendingAcknowledgement {
        message_chunk: Fragment,
        delay: SphinxDelay,
        recipient: Recipient,
-        max_retransmissions: Option<u32>,
    ) -> Self {
        PendingAcknowledgement {
            message_chunk,
            delay,
            destination: PacketDestination::KnownRecipient(recipient.into()),
            retransmissions: 0,
-            max_retransmissions,
        }
    }

@@ -97,7 +94,6 @@ impl PendingAcknowledgement {
        delay: SphinxDelay,
        recipient_tag: AnonymousSenderTag,
        extra_surb_request: bool,
-        max_retransmissions: Option<u32>,
    ) -> Self {
        PendingAcknowledgement {
            message_chunk,
@@ -107,7 +103,6 @@ impl PendingAcknowledgement {
                extra_surb_request,
            },
            retransmissions: 0,
-            max_retransmissions,
        }
    }

@@ -123,18 +118,6 @@ impl PendingAcknowledgement {
        self.delay = new_delay;
        self.retransmissions += 1;
    }
-
-    pub(crate) fn reached_max_retransmissions(
-        &self,
-        global_max_retransmissions: Option<u32>,
-    ) -> bool {
-        let reached_local_max = self
-            .max_retransmissions
-            .is_some_and(|limit| self.retransmissions >= limit);
-        let reached_global_max =
-            global_max_retransmissions.is_some_and(|limit| self.retransmissions >= limit);
-        reached_local_max || reached_global_max
-    }
 }

 /// AcknowledgementControllerConnectors represents set of channels for communication with
@@ -79,15 +79,17 @@ where

        let frag_id = timed_out_ack.message_chunk.fragment_identifier();

-        if timed_out_ack.reached_max_retransmissions(self.maximum_retransmissions) {
-            debug!("reached maximum number of allowed retransmissions for the packet");
-            if let Err(err) = self
-                .action_sender
-                .unbounded_send(Action::new_remove(frag_id))
-            {
-                error!("Failed to send remove action to the controller: {err}");
+        if let Some(limit) = self.maximum_retransmissions {
+            if timed_out_ack.retransmissions >= limit {
+                warn!("reached maximum number of allowed retransmissions for the packet");
+                if let Err(err) = self
+                    .action_sender
+                    .unbounded_send(Action::new_remove(frag_id))
+                {
+                    error!("Failed to send remove action to the controller: {err}");
+                }
+                return;
            }
-            return;
        }

        let maybe_prepared_fragment = match &timed_out_ack.destination {
@@ -6,7 +6,6 @@ use crate::client::real_messages_control::real_traffic_stream::{
    BatchRealMessageSender, RealMessage,
 };
 use crate::client::real_messages_control::{AckActionSender, Action};
-use crate::client::replies::reply_controller::MaxRetransmissions;
 use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
 use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit};
 use log::{debug, error, info, trace, warn};
@@ -143,12 +142,6 @@ impl Config {
    }
 }

-#[derive(Clone)]
-pub(crate) struct FragmentWithMaxRetransmissions {
-    pub(crate) fragment: Fragment,
-    pub(crate) max_retransmissions: MaxRetransmissions,
-}
-
 #[derive(Clone)]
 pub(crate) struct MessageHandler<R> {
    config: Config,
@@ -205,10 +198,10 @@ where
            trace!("we already had sender tag for {recipient}");
            existing
        } else {
-            debug!("creating new sender tag for {recipient}");
+            info!("creating new sender tag for {recipient}");
            let new_tag = AnonymousSenderTag::new_random(&mut self.rng);
            self.tag_storage.insert_new(recipient, new_tag);
-            info!("using {new_tag} for all anonymous messages sent to {recipient}");
+            info!("we'll be using {new_tag} for all anonymous messages sent to {recipient}");
            new_tag
        }
    }
@@ -301,14 +294,8 @@ where
            Some(chunk.fragment_identifier()),
        );
        let delay = prepared_fragment.total_delay;
-        let max_retransmissions = None;
-        let pending_ack = PendingAcknowledgement::new_anonymous(
-            chunk,
-            delay,
-            target,
-            is_extra_surb_request,
-            max_retransmissions,
-        );
+        let pending_ack =
+            PendingAcknowledgement::new_anonymous(chunk, delay, target, is_extra_surb_request);

        let lane = if is_extra_surb_request {
            TransmissionLane::ReplySurbRequest
@@ -363,7 +350,7 @@ where
    pub(crate) async fn try_send_reply_chunks_on_lane(
        &mut self,
        target: AnonymousSenderTag,
-        fragments: Vec<FragmentWithMaxRetransmissions>,
+        fragments: Vec<Fragment>,
        reply_surbs: Vec<ReplySurb>,
        lane: TransmissionLane,
    ) -> Result<(), SurbWrappedPreparationError> {
@@ -380,12 +367,12 @@ where
    pub(crate) async fn try_send_reply_chunks(
        &mut self,
        target: AnonymousSenderTag,
-        fragments: Vec<(TransmissionLane, FragmentWithMaxRetransmissions)>,
+        fragments: Vec<(TransmissionLane, Fragment)>,
        reply_surbs: Vec<ReplySurb>,
    ) -> Result<(), SurbWrappedPreparationError> {
        let prepared_fragments = self
            .prepare_reply_chunks_for_sending(
-                fragments.iter().map(|(_, f)| f.fragment.clone()).collect(),
+                fragments.iter().map(|(_, f)| f.clone()).collect(),
                reply_surbs,
            )
            .await?;
@@ -395,21 +382,12 @@ where

        for (raw, prepared) in fragments.into_iter().zip(prepared_fragments.into_iter()) {
            let lane = raw.0;
-            let FragmentWithMaxRetransmissions {
-                fragment,
-                max_retransmissions,
-            } = raw.1;
+            let fragment = raw.1;

            let real_message =
                RealMessage::new(prepared.mix_packet, Some(prepared.fragment_identifier));
            let delay = prepared.total_delay;
-            let pending_ack = PendingAcknowledgement::new_anonymous(
-                fragment,
-                delay,
-                target,
-                false,
-                max_retransmissions,
-            );
+            let pending_ack = PendingAcknowledgement::new_anonymous(fragment, delay, target, false);

            let entry = to_forward.entry(lane).or_default();
            entry.push(real_message);
@@ -438,17 +416,10 @@ where
        message: Vec<u8>,
        lane: TransmissionLane,
        packet_type: PacketType,
-        max_retransmissions: Option<u32>,
    ) -> Result<(), PreparationError> {
        let message = NymMessage::new_plain(message);
-        self.try_split_and_send_non_reply_message(
-            message,
-            recipient,
-            lane,
-            packet_type,
-            max_retransmissions,
-        )
-        .await
+        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type)
+            .await
    }

    pub(crate) async fn try_split_and_send_non_reply_message(
@@ -457,7 +428,6 @@ where
        recipient: Recipient,
        lane: TransmissionLane,
        packet_type: PacketType,
-        max_retransmissions: Option<u32>,
    ) -> Result<(), PreparationError> {
        debug!("Sending non-reply message with packet type {packet_type}");
        // TODO: I really dislike existence of this assertion, it implies code has to be re-organised
@@ -497,8 +467,7 @@ where
                Some(fragment.fragment_identifier()),
            );
            let delay = prepared_fragment.total_delay;
-            let pending_ack =
-                PendingAcknowledgement::new_known(fragment, delay, recipient, max_retransmissions);
+            let pending_ack = PendingAcknowledgement::new_known(fragment, delay, recipient);

            real_messages.push(real_message);
            pending_acks.push(pending_ack);
@@ -526,15 +495,11 @@ where
            reply_surbs,
        ));

-        // When sending SURBs we want to retransmit
-        let max_retransmissions = None;
-
        self.try_split_and_send_non_reply_message(
            message,
            recipient,
            TransmissionLane::AdditionalReplySurbs,
            packet_type,
-            max_retransmissions,
        )
        .await?;

@@ -551,7 +516,6 @@ where
        num_reply_surbs: u32,
        lane: TransmissionLane,
        packet_type: PacketType,
-        max_retransmissions: Option<u32>,
    ) -> Result<(), SurbWrappedPreparationError> {
        debug!("Sending message with reply SURBs with packet type {packet_type}");
        let sender_tag = self.get_or_create_sender_tag(&recipient);
@@ -562,14 +526,8 @@ where
        let message =
            NymMessage::new_repliable(RepliableMessage::new_data(message, sender_tag, reply_surbs));

-        self.try_split_and_send_non_reply_message(
-            message,
-            recipient,
-            lane,
-            packet_type,
-            max_retransmissions,
-        )
-        .await?;
+        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type)
+            .await?;

        log::trace!("storing {} reply keys", reply_keys.len());
        self.reply_key_storage.insert_multiple(reply_keys);
@@ -153,7 +153,7 @@ impl RealMessagesController<OsRng> {
        let rng = OsRng;

        // create channels for inter-task communication
-        let (real_message_sender, real_message_receiver) = tokio::sync::mpsc::channel(8);
+        let (real_message_sender, real_message_receiver) = tokio::sync::mpsc::channel(1);
        let (sent_notifier_tx, sent_notifier_rx) = mpsc::unbounded();
        let (ack_action_tx, ack_action_rx) = mpsc::unbounded();
        let ack_controller_connectors = AcknowledgementControllerConnectors::new(
@@ -23,10 +23,6 @@ use nym_statistics_common::clients::{packet_statistics::PacketStatisticsEvent, C
 use nym_task::TaskClient;
 use std::collections::HashSet;
 use std::sync::Arc;
-use std::time::{Duration, Instant};
-
-// The interval at which we check for stale buffers
-const STALE_BUFFER_CHECK_INTERVAL: Duration = Duration::from_secs(10);

 // Buffer Requests to say "hey, send any reconstructed messages to this channel"
 // or to say "hey, I'm going offline, don't send anything more to me. Just buffer them instead"
@@ -52,9 +48,6 @@ struct ReceivedMessagesBufferInner<R: MessageReceiver> {
    recently_reconstructed: HashSet<i32>,

    stats_tx: ClientStatsSender,
-
-    // Periodically check for stale buffers to clean up
-    last_stale_check: Instant,
 }

 impl<R: MessageReceiver> ReceivedMessagesBufferInner<R> {
@@ -103,10 +96,9 @@ impl<R: MessageReceiver> ReceivedMessagesBufferInner<R> {
                    }
                    None
                }
-                _ => {
-                    error!("unexpected error occurred during message reconstruction: {err}");
-                    None
-                }
+                _ => unreachable!(
+                    "no other error kind should have been returned here! If so, it's a bug!"
+                ),
            },
            Ok(reconstruction_result) => match reconstruction_result {
                Some((reconstructed_message, used_sets)) => {
@@ -152,16 +144,6 @@ impl<R: MessageReceiver> ReceivedMessagesBufferInner<R> {

        self.recover_from_fragment(fragment_data, raw_fragment_size)
    }
-
-    fn cleanup_stale_buffers(&mut self) {
-        let now = Instant::now();
-        if now - self.last_stale_check > STALE_BUFFER_CHECK_INTERVAL {
-            self.last_stale_check = now;
-            self.message_receiver
-                .reconstructor()
-                .cleanup_stale_buffers();
-        }
-    }
 }

 #[derive(Debug, Clone)]
@@ -190,7 +172,6 @@ impl<R: MessageReceiver> ReceivedMessagesBuffer<R> {
                message_sender: None,
                recently_reconstructed: HashSet::new(),
                stats_tx,
-                last_stale_check: Instant::now(),
            })),
            reply_key_storage,
            reply_controller_sender,
@@ -411,11 +392,6 @@ impl<R: MessageReceiver> ReceivedMessagesBuffer<R> {
            }
        }

-        // Cleanup stale buffers, if there are any fragments that simply never arrived.
-        // We do this here as part of handling new received fragments so that we can keep the event
-        // loop focused on processing new messages.
-        inner_guard.cleanup_stale_buffers();
-
        drop(inner_guard);

        if !completed_messages.is_empty() {
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
-use crate::client::real_messages_control::message_handler::{
-    FragmentWithMaxRetransmissions, MessageHandler, PreparationError,
-};
+use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError};
 use crate::client::replies::reply_storage::CombinedReplyStorage;
 use futures::channel::oneshot;
 use futures::StreamExt;
@@ -12,7 +10,7 @@ use log::{debug, error, info, trace, warn};
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::anonymous_replies::ReplySurb;
-use nym_sphinx::chunking::fragment::FragmentIdentifier;
+use nym_sphinx::chunking::fragment::{Fragment, FragmentIdentifier};
 use nym_task::connections::{ConnectionId, TransmissionLane};
 use nym_task::TaskClient;
 use rand::{CryptoRng, Rng};
@@ -51,8 +49,6 @@ impl Config {
 // - replies to "give additional surbs" requests
 // - will reply to future heartbeats

-pub type MaxRetransmissions = Option<u32>;
-
 // TODO: this should be split into ingress and egress controllers
 // because currently its trying to perform two distinct jobs
 pub struct ReplyController<R> {
@@ -63,8 +59,7 @@ pub struct ReplyController<R> {
    // of surbs required to send the message through
    // expected_reliability: f32,
    request_receiver: ReplyControllerReceiver,
-    pending_replies:
-        HashMap<AnonymousSenderTag, TransmissionBuffer<FragmentWithMaxRetransmissions>>,
+    pending_replies: HashMap<AnonymousSenderTag, TransmissionBuffer<Fragment>>,

    /// Retransmission packets that have already timed out and are waiting for additional reply SURBs
    /// so that they could be sent back to the network. Once we receive more SURBs, we should send them ASAP.
@@ -101,7 +96,7 @@ where
        }
    }

-    fn insert_pending_replies<I: IntoIterator<Item = FragmentWithMaxRetransmissions>>(
+    fn insert_pending_replies<I: IntoIterator<Item = Fragment>>(
        &mut self,
        recipient: &AnonymousSenderTag,
        fragments: I,
@@ -117,7 +112,7 @@ where
    fn re_insert_pending_replies(
        &mut self,
        recipient: &AnonymousSenderTag,
-        fragments: Vec<(TransmissionLane, FragmentWithMaxRetransmissions)>,
+        fragments: Vec<(TransmissionLane, Fragment)>,
    ) {
        trace!("re-inserting pending replies for {recipient}");
        // the buffer should ALWAYS exist at this point, if it doesn't, it's a bug...
@@ -210,7 +205,6 @@ where
        recipient_tag: AnonymousSenderTag,
        data: Vec<u8>,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    ) {
        if !self
            .full_reply_storage
@@ -248,14 +242,7 @@ where
                .get_reply_surbs(&recipient_tag, max_to_send);

            if let Some(reply_surbs) = surbs {
-                let to_send = fragments
-                    .drain(..max_to_send)
-                    .map(|f| FragmentWithMaxRetransmissions {
-                        fragment: f,
-                        max_retransmissions,
-                    })
-                    .collect::<Vec<_>>();
-
+                let to_send = fragments.drain(..max_to_send).collect::<Vec<_>>();
                if let Err(err) = self
                    .message_handler
                    .try_send_reply_chunks_on_lane(
@@ -289,13 +276,6 @@ where
                "buffering {no_fragments} fragments for {recipient_tag}",
                no_fragments = fragments.len()
            );
-            let fragments: Vec<_> = fragments
-                .into_iter()
-                .map(|fragment| FragmentWithMaxRetransmissions {
-                    fragment,
-                    max_retransmissions,
-                })
-                .collect();
            self.insert_pending_replies(&recipient_tag, fragments, lane);
        }

@@ -429,7 +409,7 @@ where
        &mut self,
        from: &AnonymousSenderTag,
        amount: usize,
-    ) -> Option<Vec<(TransmissionLane, FragmentWithMaxRetransmissions)>> {
+    ) -> Option<Vec<(TransmissionLane, Fragment)>> {
        // if possible, pop all pending replies, if not, pop only entries for which we'd have a reply surb
        let total = self.pending_replies.get(from)?.total_size();
        trace!("pending queue has {total} elements");
@@ -709,11 +689,7 @@ where
                recipient,
                message,
                lane,
-                max_retransmissions,
-            } => {
-                self.handle_send_reply(recipient, message, lane, max_retransmissions)
-                    .await
-            }
+            } => self.handle_send_reply(recipient, message, lane).await,
            ReplyControllerMessage::AdditionalSurbs {
                sender_tag,
                reply_surbs,
@@ -66,14 +66,12 @@ impl ReplyControllerSender {
        recipient: AnonymousSenderTag,
        message: Vec<u8>,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    ) -> Result<(), ReplyControllerSenderError> {
        self.0
            .unbounded_send(ReplyControllerMessage::SendReply {
                recipient,
                message,
                lane,
-                max_retransmissions,
            })
            .map_err(ReplyControllerSenderError::SendReply)
    }
@@ -162,7 +160,6 @@ pub enum ReplyControllerMessage {
        recipient: AnonymousSenderTag,
        message: Vec<u8>,
        lane: TransmissionLane,
-        max_retransmissions: Option<u32>,
    },

    AdditionalSurbs {
@@ -38,7 +38,8 @@ pub(crate) async fn connect_async(
            // Do a DNS lookup for the domain using our custom DNS resolver
            resolver
                .resolve_str(domain)
-                .await?
+                .await
+                .inspect_err(|err| tracing::error!("Resolve error {err}"))?
                .into_iter()
                .map(|a| SocketAddr::new(a, port))
                .collect()
@@ -49,20 +50,27 @@ pub(crate) async fn connect_async(
        address: endpoint.to_owned(),
    });
    for sock_addr in sock_addrs {
+        tracing::info!("Trying with {sock_addr}");
        let socket = if sock_addr.is_ipv4() {
            TcpSocket::new_v4()
        } else {
            TcpSocket::new_v6()
        }
-        .map_err(|err| GatewayClientError::NetworkConnectionFailed {
-            address: endpoint.to_owned(),
-            source: err.into(),
+        .map_err(|err| {
+            tracing::error!("Couldn't create the socket");
+            GatewayClientError::NetworkConnectionFailed {
+                address: endpoint.to_owned(),
+                source: err.into(),
+            }
        })?;

+        tracing::info!("Preparing to call callback");
        #[cfg(unix)]
        if let Some(callback) = connection_fd_callback.as_ref() {
+            tracing::info!("Calling callback");
            callback.as_ref()(socket.as_raw_fd());
        }
+        tracing::info!("Preparing to connect");

        match socket.connect(sock_addr).await {
            Ok(s) => {
@@ -16,6 +16,7 @@ nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
 nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
 nym-mixnet-contract-common = { path = "../../cosmwasm-smart-contracts/mixnet-contract" }
 nym-vesting-contract-common = { path = "../../cosmwasm-smart-contracts/vesting-contract" }
+nym-coconut-bandwidth-contract-common = { path = "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 nym-ecash-contract-common = { path = "../../cosmwasm-smart-contracts/ecash-contract" }
 nym-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
 nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" }
@@ -55,7 +56,7 @@ cw4 = { workspace = true }
 cw-controllers = { workspace = true }
 prost = { workspace = true, default-features = false }
 flate2 = { workspace = true }
-sha2 = { workspace = true }
+sha2 = { version = "0.9.5" }
 itertools = { workspace = true }
 zeroize = { workspace = true, features = ["zeroize_derive"] }
 cosmwasm-std = { workspace = true }
@@ -11,9 +11,7 @@ use crate::{
 use nym_api_requests::ecash::models::{
    AggregatedCoinIndicesSignatureResponse, AggregatedExpirationDateSignatureResponse,
    BatchRedeemTicketsBody, EcashBatchTicketRedemptionResponse, EcashTicketVerificationResponse,
-    IssuedTicketbooksChallengeCommitmentRequest, IssuedTicketbooksChallengeCommitmentResponse,
-    IssuedTicketbooksDataRequest, IssuedTicketbooksDataResponse, IssuedTicketbooksForCountResponse,
-    IssuedTicketbooksForResponse, VerifyEcashTicketBody,
+    IssuedTicketbooksChallengeResponse, IssuedTicketbooksForResponse, VerifyEcashTicketBody,
 };
 use nym_api_requests::ecash::{
    BlindSignRequestBody, BlindedSignatureResponse, PartialCoinIndicesSignatureResponse,
@@ -27,14 +25,15 @@ use nym_api_requests::models::{
 use nym_api_requests::models::{LegacyDescribedGateway, MixNodeBondAnnotated};
 use nym_api_requests::nym_nodes::{NodesByAddressesResponse, SkimmedNode};
 use nym_coconut_dkg_common::types::EpochId;
+use nym_ecash_contract_common::deposit::DepositId;
 use nym_http_api_client::UserAgent;
-use nym_mixnet_contract_common::EpochRewardedSet;
 use nym_network_defaults::NymNetworkDetails;
 use std::net::IpAddr;
 use time::Date;
 use url::Url;

 pub use crate::nym_api::NymApiClientExt;
+use nym_mixnet_contract_common::EpochRewardedSet;
 pub use nym_mixnet_contract_common::{
    mixnode::MixNodeDetails, GatewayBond, IdentityKey, IdentityKeyRef, NodeId, NymNodeDetails,
 };
@@ -702,33 +701,17 @@ impl NymApiClient {
        Ok(self.nym_api.issued_ticketbooks_for(expiration_date).await?)
    }

-    pub async fn issued_ticketbooks_for_count(
+    pub async fn issued_ticketbooks_challenge(
        &self,
        expiration_date: Date,
-    ) -> Result<IssuedTicketbooksForCountResponse, ValidatorClientError> {
+        deposits: Vec<DepositId>,
+    ) -> Result<IssuedTicketbooksChallengeResponse, ValidatorClientError> {
        Ok(self
            .nym_api
-            .issued_ticketbooks_for_count(expiration_date)
+            .issued_ticketbooks_challenge(expiration_date, deposits)
            .await?)
    }

-    pub async fn issued_ticketbooks_challenge_commitment(
-        &self,
-        request: &IssuedTicketbooksChallengeCommitmentRequest,
-    ) -> Result<IssuedTicketbooksChallengeCommitmentResponse, ValidatorClientError> {
-        Ok(self
-            .nym_api
-            .issued_ticketbooks_challenge_commitment(request)
-            .await?)
-    }
-
-    pub async fn issued_ticketbooks_data(
-        &self,
-        request: &IssuedTicketbooksDataRequest,
-    ) -> Result<IssuedTicketbooksDataResponse, ValidatorClientError> {
-        Ok(self.nym_api.issued_ticketbooks_data(request).await?)
-    }
-
    pub async fn nodes_by_addresses(
        &self,
        addresses: Vec<IpAddr>,
@@ -7,8 +7,7 @@ use async_trait::async_trait;
 use nym_api_requests::ecash::models::{
    AggregatedCoinIndicesSignatureResponse, AggregatedExpirationDateSignatureResponse,
    BatchRedeemTicketsBody, EcashBatchTicketRedemptionResponse, EcashTicketVerificationResponse,
-    IssuedTicketbooksChallengeCommitmentRequest, IssuedTicketbooksChallengeCommitmentResponse,
-    IssuedTicketbooksDataRequest, IssuedTicketbooksDataResponse, IssuedTicketbooksForCountResponse,
+    IssuedTicketbooksChallengeRequest, IssuedTicketbooksChallengeResponse,
    IssuedTicketbooksForResponse, VerifyEcashTicketBody,
 };
 use nym_api_requests::ecash::VerificationKeyResponse;
@@ -37,7 +36,10 @@ pub use nym_api_requests::{
    nym_nodes::{CachedNodesResponse, SkimmedNode},
    NymNetworkDetailsResponse,
 };
+pub use nym_coconut_dkg_common::types::EpochId;
 use nym_contracts_common::IdentityKey;
+use nym_ecash_contract_common::deposit::DepositId;
+pub use nym_http_api_client::Client;
 use nym_http_api_client::{ApiClient, NO_PARAMS};
 use nym_mixnet_contract_common::mixnode::MixNodeDetails;
 use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, NodeId, NymNodeDetails};
@@ -46,9 +48,6 @@ use time::format_description::BorrowedFormatItem;
 use time::Date;
 use tracing::instrument;

-pub use nym_coconut_dkg_common::types::EpochId;
-pub use nym_http_api_client::Client;
-
 pub mod error;
 pub mod routes;

@@ -1013,52 +1012,22 @@ pub trait NymApiClientExt: ApiClient {
    }

    #[instrument(level = "debug", skip(self))]
-    async fn issued_ticketbooks_for_count(
+    async fn issued_ticketbooks_challenge(
        &self,
        expiration_date: Date,
-    ) -> Result<IssuedTicketbooksForCountResponse, NymAPIError> {
-        self.get_json(
-            &[
-                routes::API_VERSION,
-                routes::ECASH_ROUTES,
-                routes::ECASH_ISSUED_TICKETBOOKS_FOR_COUNT,
-                &expiration_date.to_string(),
-            ],
-            NO_PARAMS,
-        )
-        .await
-    }
-
-    #[instrument(level = "debug", skip(self))]
-    async fn issued_ticketbooks_challenge_commitment(
-        &self,
-        request: &IssuedTicketbooksChallengeCommitmentRequest,
-    ) -> Result<IssuedTicketbooksChallengeCommitmentResponse, NymAPIError> {
+        deposits: Vec<DepositId>,
+    ) -> Result<IssuedTicketbooksChallengeResponse, NymAPIError> {
        self.post_json(
            &[
                routes::API_VERSION,
                routes::ECASH_ROUTES,
-                routes::ECASH_ISSUED_TICKETBOOKS_CHALLENGE_COMMITMENT,
+                routes::ECASH_ISSUED_TICKETBOOKS_CHALLENGE,
            ],
            NO_PARAMS,
-            request,
-        )
-        .await
-    }
-
-    #[instrument(level = "debug", skip(self))]
-    async fn issued_ticketbooks_data(
-        &self,
-        request: &IssuedTicketbooksDataRequest,
-    ) -> Result<IssuedTicketbooksDataResponse, NymAPIError> {
-        self.post_json(
-            &[
-                routes::API_VERSION,
-                routes::ECASH_ROUTES,
-                routes::ECASH_ISSUED_TICKETBOOKS_DATA,
-            ],
-            NO_PARAMS,
-            request,
+            &IssuedTicketbooksChallengeRequest {
+                expiration_date,
+                deposits,
+            },
        )
        .await
    }
@@ -26,12 +26,7 @@ pub mod ecash {
    pub const GLOBAL_COIN_INDICES_SIGNATURES: &str = "aggregated-coin-indices-signatures";
    pub const MASTER_VERIFICATION_KEY: &str = "master-verification-key";
    pub const ECASH_ISSUED_TICKETBOOKS_FOR: &str = "issued-ticketbooks-for";
-    pub const ECASH_ISSUED_TICKETBOOKS_COUNT: &str = "issued-ticketbooks-count";
-    pub const ECASH_ISSUED_TICKETBOOKS_FOR_COUNT: &str = "issued-ticketbooks-for-count";
-    pub const ECASH_ISSUED_TICKETBOOKS_ON_COUNT: &str = "issued-ticketbooks-on-count";
-    pub const ECASH_ISSUED_TICKETBOOKS_CHALLENGE_COMMITMENT: &str =
-        "issued-ticketbooks-challenge-commitment";
-    pub const ECASH_ISSUED_TICKETBOOKS_DATA: &str = "issued-ticketbooks-data";
+    pub const ECASH_ISSUED_TICKETBOOKS_CHALLENGE: &str = "issued-ticketbooks-challenge";

    pub const EXPIRATION_DATE_PARAM: &str = "expiration_date";
    pub const EPOCH_ID_PARAM: &str = "epoch_id";
@@ -48,7 +48,7 @@ impl Div<GasPrice> for &Coin {
            panic!("attempted to divide by zero!")
        };

-        let implicit_gas_limit = Uint128::new(self.amount).mul_floor(gas_price_inv);
+        let implicit_gas_limit = gas_price_inv * Uint128::new(self.amount);
        if implicit_gas_limit.u128() >= u64::MAX as u128 {
            u64::MAX
        } else {
@@ -169,7 +169,13 @@ impl CoinConverter for CosmosCoin {
    type Target = CosmWasmCoin;

    fn convert_coin(&self) -> Self::Target {
-        CosmWasmCoin::new(self.amount, self.denom.to_string())
+        CosmWasmCoin::new(
+            self.amount
+                .to_string()
+                .parse()
+                .expect("cosmos coin had an invalid amount assigned"),
+            self.denom.to_string(),
+        )
    }
 }

@@ -7,10 +7,10 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Coin, Fee, SigningCosmWasmClient};
 use crate::signing::signer::OfflineSigner;
 use async_trait::async_trait;
-use cosmwasm_std::{CosmosMsg, Empty};
+use cosmwasm_std::{to_binary, CosmosMsg, WasmMsg};
 use cw3::Vote;
 use cw4::{MemberChangedHookMsg, MemberDiff};
-use cw_utils::Expiration;
+use nym_coconut_bandwidth_contract_common::msg::ExecuteMsg as CoconutBandwidthExecuteMsg;
 use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg;

 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
@@ -24,23 +24,35 @@ pub trait MultisigSigningClient: NymContractsProvider {
        funds: Vec<Coin>,
    ) -> Result<ExecuteResult, NyxdError>;

-    async fn propose(
+    async fn propose_release_funds(
        &self,
        title: String,
-        description: String,
-        msgs: Vec<CosmosMsg<Empty>>,
-        latest: Option<Expiration>,
+        blinded_serial_number: String,
+        voucher_value: Coin,
        fee: Option<Fee>,
    ) -> Result<ExecuteResult, NyxdError> {
+        let ecash_contract_address = self
+            .ecash_contract_address()
+            .ok_or_else(|| NyxdError::unavailable_contract_address("coconut bandwidth contract"))?;
+
+        let release_funds_req = CoconutBandwidthExecuteMsg::ReleaseFunds {
+            funds: voucher_value.into(),
+        };
+        let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
+            contract_addr: ecash_contract_address.to_string(),
+            msg: to_binary(&release_funds_req)?,
+            funds: vec![],
+        });
+        let req = MultisigExecuteMsg::Propose {
+            title,
+            description: blinded_serial_number,
+            msgs: vec![release_funds_msg],
+            latest: None,
+        };
        self.execute_multisig_contract(
            fee,
-            MultisigExecuteMsg::Propose {
-                title,
-                description,
-                msgs,
-                latest,
-            },
-            "Multisig::Propose".to_string(),
+            req,
+            "Multisig::Propose::Execute::ReleaseFunds".to_string(),
            vec![],
        )
        .await
@@ -149,7 +161,7 @@ where
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::nyxd::contract_traits::tests::IgnoreValue;
+    use crate::nyxd::contract_traits::tests::{mock_coin, IgnoreValue};

    // it's enough that this compiles and clippy is happy about it
    #[allow(dead_code)]
@@ -159,12 +171,9 @@ mod tests {
    ) {
        match msg {
            MultisigExecuteMsg::Propose {
-                title,
-                description,
-                msgs,
-                latest,
+                title, description, ..
            } => client
-                .propose(title, description, msgs, latest, None)
+                .propose_release_funds(title, description, mock_coin(), None)
                .ignore(),
            MultisigExecuteMsg::Vote { proposal_id, vote } => {
                client.vote(proposal_id, vote, None).ignore()
@@ -27,7 +27,7 @@ impl Mul<Gas> for &GasPrice {

    fn mul(self, gas_limit: Gas) -> Self::Output {
        let limit_uint128 = Uint128::from(gas_limit);
-        let mut amount = limit_uint128.mul_floor(self.amount);
+        let mut amount = self.amount * limit_uint128;

        let gas_price_numerator = self.amount.numerator();
        let gas_price_denominator = self.amount.denominator();
@@ -35,7 +35,7 @@ impl Mul<Gas> for &GasPrice {
        // gas price is a fraction of the smallest fee token unit, so we must ensure that
        // for any multiplication, we have rounded up
        //
-        // I don't really like this solution as it has a theoretical chance of
+        // I don't really like the this solution as it has a theoretical chance of
        // overflowing (internally cosmwasm uses U256 to avoid that)
        // however, realistically that is impossible to happen as the resultant value
        // would have to be way higher than our token limit of 10^15 (1 billion of tokens * 1 million for denomination)
@@ -155,7 +155,7 @@ async fn fetch_delegation_data(
        match event.event.kind {
            // If a pending undelegate tx is found, remove it from delegation map
            PendingEpochEventKind::Undelegate { owner, node_id, .. } => {
-                if owner.as_str() == address.as_ref()
+                if owner == address.as_ref()
                    && existing_delegation_map.contains_key(&node_id.to_string())
                {
                    existing_delegation_map.remove(&node_id.to_string());
@@ -169,7 +169,7 @@ async fn fetch_delegation_data(
                amount,
                ..
            } => {
-                if owner.as_str() == address.as_ref() {
+                if owner == address.as_ref() {
                    let mut amount = Coin::from(amount);
                    if let Some(pending_record) = pending_delegation_map.get(&node_id.to_string()) {
                        amount.amount += pending_record.amount;
@@ -54,7 +54,7 @@ pub async fn create(args: Args, client: SigningClient, network_details: &NymNetw

    let denom = network_details.chain_details.mix_denom.base.to_string();

-    let coin = Coin::new(args.amount, &denom);
+    let coin = Coin::new(args.amount.into(), &denom);

    let res = client
        .create_periodic_vesting_account(
@@ -0,0 +1,16 @@
+[package]
+name = "nym-coconut-bandwidth-contract-common"
+version = "0.1.0"
+edition = "2021"
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cosmwasm-std = { workspace = true }
+cosmwasm-schema = { workspace = true }
+cw2 = { workspace = true, optional = true }
+nym-multisig-contract-common = { path = "../multisig-contract" }
+
+[features]
+schema = ["cw2"]
@@ -0,0 +1,33 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_schema::cw_serde;
+
+#[cw_serde]
+pub struct DepositData {
+    deposit_info: String,
+    identity_key: String,
+    encryption_key: String,
+}
+
+impl DepositData {
+    pub fn new(deposit_info: String, identity_key: String, encryption_key: String) -> Self {
+        DepositData {
+            deposit_info,
+            identity_key,
+            encryption_key,
+        }
+    }
+
+    pub fn deposit_info(&self) -> &str {
+        &self.deposit_info
+    }
+
+    pub fn identity_key(&self) -> &str {
+        &self.identity_key
+    }
+
+    pub fn encryption_key(&self) -> &str {
+        &self.encryption_key
+    }
+}
@@ -0,0 +1,4 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub const BANDWIDTH_PROPOSAL_ID: &str = "proposal_id";
@@ -0,0 +1,11 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+// event types
+pub const DEPOSITED_FUNDS_EVENT_TYPE: &str = "deposited-funds";
+
+// attributes that are used in multiple places
+pub const DEPOSIT_VALUE: &str = "deposit-value";
+pub const DEPOSIT_INFO: &str = "deposit-info";
+pub const DEPOSIT_IDENTITY_KEY: &str = "deposit-identity-key";
+pub const DEPOSIT_ENCRYPTION_KEY: &str = "deposit-encryption-key";
@@ -0,0 +1,5 @@
+pub mod deposit;
+pub mod event_attributes;
+pub mod events;
+pub mod msg;
+pub mod spend_credential;
@@ -0,0 +1,41 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{deposit::DepositData, spend_credential::SpendCredentialData};
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::Coin;
+
+#[cfg(feature = "schema")]
+use crate::spend_credential::{PagedSpendCredentialResponse, SpendCredentialResponse};
+#[cfg(feature = "schema")]
+use cosmwasm_schema::QueryResponses;
+
+#[cw_serde]
+pub struct InstantiateMsg {
+    pub multisig_addr: String,
+    pub pool_addr: String,
+    pub mix_denom: String,
+}
+
+#[cw_serde]
+pub enum ExecuteMsg {
+    DepositFunds { data: DepositData },
+    SpendCredential { data: SpendCredentialData },
+    ReleaseFunds { funds: Coin },
+}
+
+#[cw_serde]
+#[cfg_attr(feature = "schema", derive(QueryResponses))]
+pub enum QueryMsg {
+    #[cfg_attr(feature = "schema", returns(SpendCredentialResponse))]
+    GetSpentCredential { blinded_serial_number: String },
+
+    #[cfg_attr(feature = "schema", returns(PagedSpendCredentialResponse))]
+    GetAllSpentCredentials {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+}
+
+#[cw_serde]
+pub struct MigrateMsg {}
@@ -0,0 +1,152 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::{from_binary, to_binary, Addr, Coin, CosmosMsg, StdResult, WasmMsg};
+use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg;
+
+use crate::msg::ExecuteMsg;
+
+#[cw_serde]
+pub struct SpendCredentialData {
+    funds: Coin,
+    blinded_serial_number: String,
+    gateway_cosmos_address: String,
+}
+
+impl SpendCredentialData {
+    pub fn new(funds: Coin, blinded_serial_number: String, gateway_cosmos_address: String) -> Self {
+        SpendCredentialData {
+            funds,
+            blinded_serial_number,
+            gateway_cosmos_address,
+        }
+    }
+
+    pub fn funds(&self) -> &Coin {
+        &self.funds
+    }
+
+    pub fn blinded_serial_number(&self) -> &str {
+        &self.blinded_serial_number
+    }
+
+    pub fn gateway_cosmos_address(&self) -> &str {
+        &self.gateway_cosmos_address
+    }
+}
+
+#[cw_serde]
+#[derive(Copy)]
+pub enum SpendCredentialStatus {
+    #[serde(alias = "InProgress")]
+    InProgress,
+    #[serde(alias = "Spent")]
+    Spent,
+}
+
+#[cw_serde]
+pub struct SpendCredential {
+    funds: Coin,
+    blinded_serial_number: String,
+    gateway_cosmos_address: Addr,
+    status: SpendCredentialStatus,
+}
+
+impl SpendCredential {
+    pub fn new(funds: Coin, blinded_serial_number: String, gateway_cosmos_address: Addr) -> Self {
+        SpendCredential {
+            funds,
+            blinded_serial_number,
+            gateway_cosmos_address,
+            status: SpendCredentialStatus::InProgress,
+        }
+    }
+
+    pub fn blinded_serial_number(&self) -> &str {
+        &self.blinded_serial_number
+    }
+
+    pub fn status(&self) -> SpendCredentialStatus {
+        self.status
+    }
+
+    pub fn mark_as_spent(&mut self) {
+        self.status = SpendCredentialStatus::Spent;
+    }
+}
+
+#[cw_serde]
+pub struct PagedSpendCredentialResponse {
+    pub spend_credentials: Vec<SpendCredential>,
+    pub per_page: usize,
+
+    /// Field indicating paging information for the following queries if the caller wishes to get further entries.
+    pub start_next_after: Option<String>,
+}
+
+impl PagedSpendCredentialResponse {
+    pub fn new(
+        spend_credentials: Vec<SpendCredential>,
+        per_page: usize,
+        start_next_after: Option<String>,
+    ) -> Self {
+        PagedSpendCredentialResponse {
+            spend_credentials,
+            per_page,
+            start_next_after,
+        }
+    }
+}
+
+#[cw_serde]
+pub struct SpendCredentialResponse {
+    pub spend_credential: Option<SpendCredential>,
+}
+
+impl SpendCredentialResponse {
+    pub fn new(spend_credential: Option<SpendCredential>) -> Self {
+        SpendCredentialResponse { spend_credential }
+    }
+}
+
+pub fn to_cosmos_msg(
+    funds: Coin,
+    blinded_serial_number: String,
+    coconut_bandwidth_addr: String,
+    multisig_addr: String,
+) -> StdResult<CosmosMsg> {
+    let release_funds_req = ExecuteMsg::ReleaseFunds { funds };
+    let release_funds_msg = CosmosMsg::Wasm(WasmMsg::Execute {
+        contract_addr: coconut_bandwidth_addr,
+        msg: to_binary(&release_funds_req)?,
+        funds: vec![],
+    });
+    let req = MultisigExecuteMsg::Propose {
+        title: String::from("Release funds, as ordered by Coconut Bandwidth Contract"),
+        description: blinded_serial_number,
+        msgs: vec![release_funds_msg],
+        latest: None,
+    };
+    let msg = CosmosMsg::Wasm(WasmMsg::Execute {
+        contract_addr: multisig_addr,
+        msg: to_binary(&req)?,
+        funds: vec![],
+    });
+
+    Ok(msg)
+}
+
+pub fn funds_from_cosmos_msgs(msgs: Vec<CosmosMsg>) -> Option<Coin> {
+    if let Some(CosmosMsg::Wasm(WasmMsg::Execute {
+        contract_addr: _,
+        msg,
+        funds: _,
+    })) = msgs.first()
+    {
+        if let Ok(ExecuteMsg::ReleaseFunds { funds }) = from_binary::<ExecuteMsg>(msg) {
+            return Some(funds);
+        }
+    }
+    None
+}
@@ -4,7 +4,7 @@
 use crate::msg::ExecuteMsg;
 use crate::types::{EpochId, NodeIndex};
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{from_json, to_json_binary, Addr, CosmosMsg, StdResult, Timestamp, WasmMsg};
+use cosmwasm_std::{from_binary, to_binary, Addr, CosmosMsg, StdResult, Timestamp, WasmMsg};
 use cw_utils::Expiration;
 use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg;

@@ -49,7 +49,7 @@ pub fn to_cosmos_msg(
    };
    let verify_vk_share_msg = CosmosMsg::Wasm(WasmMsg::Execute {
        contract_addr: coconut_dkg_addr,
-        msg: to_json_binary(&verify_vk_share_req)?,
+        msg: to_binary(&verify_vk_share_req)?,
        funds: vec![],
    });
    let req = MultisigExecuteMsg::Propose {
@@ -60,7 +60,7 @@ pub fn to_cosmos_msg(
    };
    let msg = CosmosMsg::Wasm(WasmMsg::Execute {
        contract_addr: multisig_addr,
-        msg: to_json_binary(&req)?,
+        msg: to_binary(&req)?,
        funds: vec![],
    });

@@ -82,7 +82,7 @@ pub fn owner_from_cosmos_msgs(msgs: &[CosmosMsg]) -> Option<String> {
    })) = msgs.first()
    {
        if let Ok(ExecuteMsg::VerifyVerificationKeyShare { owner, .. }) =
-            from_json::<ExecuteMsg>(msg)
+            from_binary::<ExecuteMsg>(msg)
        {
            return Some(owner);
        }
@@ -1,7 +1,7 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0

-use cosmwasm_std::{from_json, to_json_vec, Addr, Coin, MessageInfo, StdResult};
+use cosmwasm_std::{from_slice, to_vec, Addr, Coin, MessageInfo, StdResult};
 use schemars::JsonSchema;
 use serde::de::DeserializeOwned;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
@@ -164,7 +164,7 @@ where
    where
        T: Serialize,
    {
-        to_json_vec(self)
+        to_vec(self)
    }

    pub fn to_sha256_plaintext_digest(&self) -> StdResult<Vec<u8>>
@@ -195,7 +195,7 @@ where
    where
        T: DeserializeOwned,
    {
-        from_json(bytes)
+        from_slice(bytes)
    }

    pub fn try_from_string(raw: &str) -> StdResult<SignableMessage<T>>
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0

 use cosmwasm_schema::cw_serde;
+use cosmwasm_std::Decimal;
 use cosmwasm_std::OverflowError;
 use cosmwasm_std::Uint128;
-use cosmwasm_std::{Decimal, Fraction};
 use serde::de::Error;
 use serde::{Deserialize, Deserializer};
 use std::fmt::{self, Display, Formatter};
@@ -17,7 +17,7 @@ pub type IdentityKey = String;
 pub type IdentityKeyRef<'a> = &'a str;

 pub fn truncate_decimal(amount: Decimal) -> Uint128 {
-    Uint128::new(1).mul_floor(amount)
+    amount * Uint128::new(1)
 }

 #[derive(Error, Debug)]
@@ -113,17 +113,11 @@ impl Mul<Percent> for Decimal {
    }
 }

-impl Fraction<Uint128> for Percent {
-    fn numerator(&self) -> Uint128 {
-        self.0.numerator()
-    }
+impl Mul<Uint128> for Percent {
+    type Output = Uint128;

-    fn denominator(&self) -> Uint128 {
-        self.0.denominator()
-    }
-
-    fn inv(&self) -> Option<Self> {
-        Percent::new(self.0.inv()?).ok()
+    fn mul(self, rhs: Uint128) -> Self::Output {
+        self.0 * rhs
    }
 }

@@ -1,14 +0,0 @@
-[package]
-name = "easy-addr"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license.workspace = true
-
-[lib]
-proc-macro = true
-
-[dependencies]
-cosmwasm-std = { workspace = true }
-quote = { workspace = true }
-syn = { workspace = true, features = ["full", "printing", "extra-traits"] }
@@ -1,12 +0,0 @@
-use cosmwasm_std::testing::MockApi;
-
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::parse_macro_input;
-
-#[proc_macro]
-pub fn addr(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as syn::LitStr).value();
-    let addr = MockApi::default().addr_make(input.as_str()).to_string();
-    TokenStream::from(quote! {#addr})
-}
@@ -241,10 +241,10 @@ mod tests {

    #[test]
    fn gateway_bond_partial_ord() {
-        let _150foos = Coin::new(150u32, "foo");
-        let _140foos = Coin::new(140u32, "foo");
-        let _50foos = Coin::new(50u32, "foo");
-        let _0foos = Coin::new(0u32, "foo");
+        let _150foos = Coin::new(150, "foo");
+        let _140foos = Coin::new(140, "foo");
+        let _50foos = Coin::new(50, "foo");
+        let _0foos = Coin::new(0, "foo");

        let gate1 = GatewayBond {
            pledge_amount: _150foos.clone(),
@@ -34,10 +34,8 @@ where
 {
    fn into_base_decimal(self) -> StdResult<Decimal> {
        let atomics = self.into();
-        Decimal::from_atomics(atomics, 0).map_err(|_| {
-            StdError::generic_err(format!(
-                "Decimal range exceeded for {atomics} with 0 decimal places."
-            ))
+        Decimal::from_atomics(atomics, 0).map_err(|_| StdError::GenericErr {
+            msg: format!("Decimal range exceeded for {atomics} with 0 decimal places."),
        })
    }
 }
@@ -77,8 +77,6 @@ impl<'a> PrimaryKey<'a> for Role {
 impl KeyDeserialize for Role {
    type Output = Role;

-    const KEY_ELEMS: u16 = 1;
-
    fn from_vec(value: Vec<u8>) -> StdResult<Self::Output> {
        let u8_key: <u8 as KeyDeserialize>::Output = <u8 as KeyDeserialize>::from_vec(value)?;
        Role::try_from(u8_key).map_err(|err| StdError::generic_err(err.to_string()))
@@ -242,7 +242,7 @@ mod tests {
        #[allow(clippy::unwrap_used)]
        fn base_simulator(initial_pledge: u128) -> Simulator {
            let profit_margin = Percent::from_percentage_value(10).unwrap();
-            let interval_operating_cost = Coin::new(40_000_000u64, "unym");
+            let interval_operating_cost = Coin::new(40_000_000, "unym");
            let epochs_in_interval = 720u32;
            let interval_pool_emission = Percent::from_percentage_value(2).unwrap();

@@ -347,7 +347,7 @@ mod tests {
        fn single_delegation_at_genesis() {
            let mut simulator = base_simulator(10000_000000);
            simulator
-                .delegate("alice", Coin::new(18000_000000u64, "unym"), 0)
+                .delegate("alice", Coin::new(18000_000000, "unym"), 0)
                .unwrap();

            let node_params = NodeRewardingParameters::new(
@@ -393,7 +393,7 @@ mod tests {
            compare_decimals(rewards1.operator, expected_operator1, None);

            simulator
-                .delegate("alice", Coin::new(18000_000000u64, "unym"), 0)
+                .delegate("alice", Coin::new(18000_000000, "unym"), 0)
                .unwrap();

            let rewards2 = simulator.simulate_epoch_single_node(node_params).unwrap();
@@ -439,10 +439,10 @@ mod tests {
            // add 2 delegations at genesis (because it makes things easier and as shown with previous tests
            // delegating at different times still work)
            simulator
-                .delegate("alice", Coin::new(18000_000000u64, "unym"), 0)
+                .delegate("alice", Coin::new(18000_000000, "unym"), 0)
                .unwrap();
            simulator
-                .delegate("bob", Coin::new(4000_000000u64, "unym"), 0)
+                .delegate("bob", Coin::new(4000_000000, "unym"), 0)
                .unwrap();

            // "normal", sanity check rewarding
@@ -484,10 +484,10 @@ mod tests {
            // add 2 delegations at genesis (because it makes things easier and as shown with previous tests
            // delegating at different times still work)
            simulator
-                .delegate("alice", Coin::new(18000_000000u64, "unym"), 0)
+                .delegate("alice", Coin::new(18000_000000, "unym"), 0)
                .unwrap();
            simulator
-                .delegate("bob", Coin::new(4000_000000u64, "unym"), 0)
+                .delegate("bob", Coin::new(4000_000000, "unym"), 0)
                .unwrap();

            // "normal", sanity check rewarding
@@ -553,12 +553,12 @@ mod tests {
            for epoch in 0..720 {
                if epoch == 0 {
                    simulator
-                        .delegate("a", Coin::new(18000_000000u64, "unym"), 0)
+                        .delegate("a", Coin::new(18000_000000, "unym"), 0)
                        .unwrap()
                }
                if epoch == 42 {
                    simulator
-                        .delegate("b", Coin::new(2000_000000u64, "unym"), 0)
+                        .delegate("b", Coin::new(2000_000000, "unym"), 0)
                        .unwrap()
                }
                if epoch == 89 {
@@ -566,7 +566,7 @@ mod tests {
                }
                if epoch == 123 {
                    simulator
-                        .delegate("c", Coin::new(6666_000000u64, "unym"), 0)
+                        .delegate("c", Coin::new(6666_000000, "unym"), 0)
                        .unwrap()
                }
                if epoch == 167 {
@@ -574,7 +574,7 @@ mod tests {
                }
                if epoch == 245 {
                    simulator
-                        .delegate("d", Coin::new(2050_000000u64, "unym"), 0)
+                        .delegate("d", Coin::new(2050_000000, "unym"), 0)
                        .unwrap()
                }
                if epoch == 264 {
@@ -597,7 +597,7 @@ mod tests {
                }
                if epoch == 545 {
                    simulator
-                        .delegate("e", Coin::new(5000_000000u64, "unym"), 0)
+                        .delegate("e", Coin::new(5000_000000, "unym"), 0)
                        .unwrap()
                }

@@ -666,132 +666,132 @@ mod tests {

        let n0 = simulator
            .bond(
-                Coin::new(11_000_000_000000u64, "unym"),
+                Coin::new(11_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(1_000_000_000000u64, "unym"), n0)
+            .delegate("delegator", Coin::new(1_000_000_000000, "unym"), n0)
            .unwrap();

        let n1 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(11_000_000_000000u64, "unym"), n1)
+            .delegate("delegator", Coin::new(11_000_000_000000, "unym"), n1)
            .unwrap();

        let n2 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(9_000_000_000000u64, "unym"), n2)
+            .delegate("delegator", Coin::new(9_000_000_000000, "unym"), n2)
            .unwrap();

        let n3 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(0).unwrap(),
-                    interval_operating_cost: Coin::new(500_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(500_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(7_000_000_000000u64, "unym"), n3)
+            .delegate("delegator", Coin::new(7_000_000_000000, "unym"), n3)
            .unwrap();

        let n4 = simulator
            .bond(
-                Coin::new(1000_000000u64, "unym"),
+                Coin::new(1000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(7_999_000_000000u64, "unym"), n4)
+            .delegate("delegator", Coin::new(7_999_000_000000, "unym"), n4)
            .unwrap();

        let n5 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(7_000_000_000000u64, "unym"), n5)
+            .delegate("delegator", Coin::new(7_000_000_000000, "unym"), n5)
            .unwrap();

        let n6 = simulator
            .bond(
-                Coin::new(11_000_000_000000u64, "unym"),
+                Coin::new(11_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(1_000_000_000000u64, "unym"), n6)
+            .delegate("delegator", Coin::new(1_000_000_000000, "unym"), n6)
            .unwrap();

        let n7 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(9_000_000_000000u64, "unym"), n7)
+            .delegate("delegator", Coin::new(9_000_000_000000, "unym"), n7)
            .unwrap();

        let n8 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(0).unwrap(),
-                    interval_operating_cost: Coin::new(500_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(500_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(7_000_000_000000u64, "unym"), n8)
+            .delegate("delegator", Coin::new(7_000_000_000000, "unym"), n8)
            .unwrap();

        let n9 = simulator
            .bond(
-                Coin::new(1_000_000_000000u64, "unym"),
+                Coin::new(1_000_000_000000, "unym"),
                NodeCostParams {
                    profit_margin_percent: Percent::from_percentage_value(10).unwrap(),
-                    interval_operating_cost: Coin::new(40_000_000u64, "unym"),
+                    interval_operating_cost: Coin::new(40_000_000, "unym"),
                },
            )
            .unwrap();
        simulator
-            .delegate("delegator", Coin::new(7_000_000_000000u64, "unym"), n9)
+            .delegate("delegator", Coin::new(7_000_000_000000, "unym"), n9)
            .unwrap();

        let uptime_1 = Percent::from_percentage_value(100).unwrap();
@@ -3,7 +3,7 @@

 use crate::ecash::error::EcashTicketError;
 use crate::Error;
-use cosmwasm_std::{from_json, CosmosMsg, WasmMsg};
+use cosmwasm_std::{from_binary, CosmosMsg, WasmMsg};
 use nym_credentials_interface::VerificationKeyAuth;
 use nym_ecash_contract_common::msg::ExecuteMsg;
 use nym_gateway_storage::GatewayStorage;
@@ -72,7 +72,7 @@ impl SharedState {
        let CosmosMsg::Wasm(WasmMsg::Execute { msg, .. }) = msg else {
            return false;
        };
-        let Ok(ExecuteMsg::RedeemTickets { gw, .. }) = from_json(msg) else {
+        let Ok(ExecuteMsg::RedeemTickets { gw, .. }) = from_binary(msg) else {
            return false;
        };

@@ -16,20 +16,3 @@ pub mod bs58_ed25519_pubkey {
        PublicKey::from_base58_string(s).map_err(serde::de::Error::custom)
    }
 }
-
-pub mod bs58_ed25519_signature {
-    use crate::asymmetric::identity::Signature;
-    use serde::{Deserialize, Deserializer, Serializer};
-
-    pub fn serialize<S: Serializer>(
-        signature: &Signature,
-        serializer: S,
-    ) -> Result<S::Ok, S::Error> {
-        serializer.serialize_str(&signature.to_base58_string())
-    }
-
-    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Signature, D::Error> {
-        let s = String::deserialize(deserializer)?;
-        Signature::from_base58_string(s).map_err(serde::de::Error::custom)
-    }
-}
@@ -12,13 +12,7 @@ license.workspace = true

 [dependencies]
 async-trait = { workspace = true }
-reqwest = { workspace = true, features = [
-    "json",
-    "gzip",
-    "deflate",
-    "brotli",
-    "zstd",
-] }
+reqwest = { workspace = true, features = ["json", "gzip"] }
 http.workspace = true
 url = { workspace = true }
 once_cell = { workspace = true }
@@ -36,10 +30,7 @@ mime = { workspace = true }
 nym-bin-common = { path = "../bin-common" }

 [target."cfg(not(target_arch = \"wasm32\"))".dependencies]
-hickory-resolver = { workspace = true, features = [
-    "dns-over-https-rustls",
-    "webpki-roots",
-] }
+hickory-resolver = { workspace = true, features = ["dns-over-https-rustls", "webpki-roots"] }

 # for request timeout until https://github.com/seanmonstar/reqwest/issues/1135 is fixed
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer]
@@ -36,10 +36,11 @@ use std::{

 use hickory_resolver::{
    config::{LookupIpStrategy, NameServerConfigGroup, ResolverConfig, ResolverOpts},
-    error::{ResolveError, ResolveErrorKind},
-    lookup_ip::{LookupIp, LookupIpIntoIter},
+    error::ResolveError,
+    lookup_ip::LookupIpIntoIter,
    TokioAsyncResolver,
 };
+use hickory_resolver::{error::ResolveErrorKind, lookup_ip::LookupIp};
 use once_cell::sync::OnceCell;
 use reqwest::dns::{Addrs, Name, Resolve, Resolving};
 use tracing::warn;
@@ -213,7 +214,10 @@ impl HickoryDnsResolver {
 /// Create a new resolver with a custom DoT based configuration. The options are overridden to look
 /// up for both IPv4 and IPv6 addresses to work with "happy eyeballs" algorithm.
 fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsError> {
-    let mut name_servers = NameServerConfigGroup::quad9_tls();
+    let mut name_servers = NameServerConfigGroup::google_tls();
+    name_servers.merge(NameServerConfigGroup::google_https());
+    // name_servers.merge(NameServerConfigGroup::google_h3());
+    name_servers.merge(NameServerConfigGroup::quad9_tls());
    name_servers.merge(NameServerConfigGroup::quad9_https());
    name_servers.merge(NameServerConfigGroup::cloudflare_tls());
    name_servers.merge(NameServerConfigGroup::cloudflare_https());
@@ -265,18 +265,14 @@ impl ClientBuilder {

        #[cfg(not(target_arch = "wasm32"))]
        let reqwest_client_builder = {
-            // Note: I believe the manual enable calls for the compression methods are extra
-            // as the various compression features for `reqwest` crate should be enabled
-            // just by including the feature which:
-            // `"Enable[s] auto decompression by checking the Content-Encoding response header."`
+            let r = reqwest::ClientBuilder::new();
+
+            // Note this is extra as the `gzip` feature for `reqwest` crate should be enabled which
+            // `"Enable[s] auto gzip decompression by checking the Content-Encoding response header."`
            //
-            // I am going to leave these here anyways so that removing a decompression method
-            // from the features list will throw an error if it is not also removed here.
-            reqwest::ClientBuilder::new()
-                .gzip(true)
-                .deflate(true)
-                .brotli(true)
-                .zstd(true)
+            // I am going to leave it here anyways so that gzip decompression is attempted even if
+            // that feature is removed.
+            r.gzip(true)
        };

        ClientBuilder {
@@ -539,6 +535,11 @@ impl ApiClientCore for Client {

        let mut request = self.reqwest_client.request(method.clone(), url);

+        // Indicate that compressed responses are preferred, but if not supported other encodings are fine.
+        // TODO: Down the road we can be more selective about adding this, but it's inclusion here guarantees
+        // that we use compression when available.
+        request = request.header(reqwest::header::ACCEPT_ENCODING, "gzip;q=1.0, *;q=0.5");
+
        if let Some(body) = json_body {
            request = request.json(body);
        }
@@ -23,12 +23,14 @@ const LENGTH_PREFIX_SIZE: usize = 2;
 // long for the buffer to fill up, since this kills latency.
 pub struct MultiIpPacketCodec {
    buffer: BytesMut,
+    buffer_timeout: tokio::time::Interval,
 }

 impl MultiIpPacketCodec {
-    pub fn new() -> Self {
+    pub fn new(buffer_timeout: Duration) -> Self {
        MultiIpPacketCodec {
            buffer: BytesMut::new(),
+            buffer_timeout: tokio::time::interval(buffer_timeout),
        }
    }

@@ -38,81 +40,56 @@ impl MultiIpPacketCodec {
        bundled_packets.extend_from_slice(&packet);
        bundled_packets.freeze()
    }
-}

-impl Default for MultiIpPacketCodec {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// The packet that we encode and decode with the MultiIpPacketCodec into bundled multi-ip packets.
-/// The data here is the actual IP packet that we want to send, not the bundled packets.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum IprPacket {
-    Data(Bytes),
-    Flush,
-}
-
-impl IprPacket {
-    pub fn as_bytes(&self) -> &[u8] {
-        match self {
-            IprPacket::Data(bytes) => bytes.as_ref(),
-            IprPacket::Flush => &[],
+    // Append a packet to the buffer and return the buffer if it's full
+    pub fn append_packet(&mut self, packet: Bytes) -> Option<Bytes> {
+        let mut bundled_packets = BytesMut::new();
+        self.encode(packet, &mut bundled_packets).unwrap();
+        if bundled_packets.is_empty() {
+            None
+        } else {
+            // log::info!("Sphinx packet utilization: {:.2}", self.buffer.len() as f64 / MAX_PACKET_SIZE as f64);
+            Some(bundled_packets.freeze())
        }
    }

-    pub fn into_bytes(self) -> Bytes {
-        match self {
-            IprPacket::Data(bytes) => bytes,
-            IprPacket::Flush => Bytes::new(),
+    // Flush the current buffer and return it.
+    pub fn flush_current_buffer(&mut self) -> Bytes {
+        let mut output_buffer = BytesMut::new();
+        std::mem::swap(&mut output_buffer, &mut self.buffer);
+        output_buffer.freeze()
+    }
+
+    // Wait for the buffer_timeout to tick and then flush the buffer.
+    // This is useful when we want to send the buffer even if it's not full.
+    pub async fn buffer_timeout(&mut self) -> Option<Bytes> {
+        // Wait for buffer_timeout to tick
+        let _ = self.buffer_timeout.tick().await;
+
+        // Flush the buffer and return it
+        let packets = self.flush_current_buffer();
+        if packets.is_empty() {
+            None
+        } else {
+            Some(packets)
        }
    }
 }

-impl From<Bytes> for IprPacket {
-    fn from(bytes: Bytes) -> Self {
-        IprPacket::Data(bytes)
-    }
-}
-
-impl From<Vec<u8>> for IprPacket {
-    fn from(bytes: Vec<u8>) -> Self {
-        IprPacket::Data(Bytes::from(bytes))
-    }
-}
-
-impl Encoder<IprPacket> for MultiIpPacketCodec {
+impl Encoder<Bytes> for MultiIpPacketCodec {
    type Error = Error;

-    fn encode(&mut self, packet: IprPacket, dst: &mut BytesMut) -> Result<(), Self::Error> {
-        let packet = match packet {
-            IprPacket::Flush => {
-                dst.extend_from_slice(&self.buffer);
-                self.buffer = BytesMut::new();
-                return Ok(());
-            }
-            IprPacket::Data(packet) => packet,
-        };
-
+    fn encode(&mut self, packet: Bytes, dst: &mut BytesMut) -> Result<(), Self::Error> {
+        if self.buffer.is_empty() {
+            self.buffer_timeout.reset();
+        }
        let packet_size = packet.len();

-        // If the existing buffer is empty, and the packet is too large, send it directly
-        if self.buffer.is_empty() && packet_size + LENGTH_PREFIX_SIZE > MAX_PACKET_SIZE {
-            // Add the packet size
-            dst.extend_from_slice(&(packet_size as u16).to_be_bytes());
-            // Add the packet to the buffer
-            dst.extend_from_slice(&packet);
-            return Ok(());
-        }
-
-        // If the packet doesn't fit in the existing buffer, send what we have now in the buffer
-        // and then add it to the next buffer
        if self.buffer.len() + packet_size + LENGTH_PREFIX_SIZE > MAX_PACKET_SIZE {
-            // Send the existing buffer
+            // If the packet doesn't fit in the buffer, send the buffer and then add it to the buffer
            dst.extend_from_slice(&self.buffer);
-            // Start a new buffer
            self.buffer = BytesMut::new();
+            self.buffer_timeout.reset();
        }

        // Add the packet size
@@ -126,7 +103,7 @@ impl Encoder<IprPacket> for MultiIpPacketCodec {
 }

 impl Decoder for MultiIpPacketCodec {
-    type Item = IprPacket;
+    type Item = Bytes;
    type Error = Error;

    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
@@ -148,86 +125,6 @@ impl Decoder for MultiIpPacketCodec {
        // Read the packet
        let packet = src.split_to(packet_size);

-        Ok(Some(IprPacket::Data(packet.freeze())))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_multi_ip_packet_codec_max_packet_size() {
-        let mut codec = MultiIpPacketCodec::new();
-        let mut buffer = BytesMut::new();
-
-        // A packet size that is large enough that two packets won't fit in the buffer
-        const PACKET_SIZE: usize = MAX_PACKET_SIZE - 100;
-
-        let packet1 = IprPacket::from(Bytes::from_static(&[0u8; PACKET_SIZE]));
-        let packet2 = IprPacket::from(Bytes::from_static(&[0u8; PACKET_SIZE]));
-
-        codec.encode(packet1.clone(), &mut buffer).unwrap();
-        assert_eq!(buffer.len(), 0);
-
-        codec.encode(packet2.clone(), &mut buffer).unwrap();
-        assert_eq!(buffer.len(), LENGTH_PREFIX_SIZE + PACKET_SIZE);
-
-        // First is the length prefix
-        assert_eq!(buffer[..2], (PACKET_SIZE as u16).to_be_bytes());
-        // Next is the packet
-        assert_eq!(&buffer[2..], packet1.as_bytes());
-    }
-
-    #[test]
-    fn encode_and_then_decode() {
-        let mut codec = MultiIpPacketCodec::new();
-        let mut buffer = BytesMut::new();
-
-        let packet = IprPacket::from(Bytes::from_static(&[0u8; 1000]));
-        codec.encode(packet.clone(), &mut buffer).unwrap();
-        codec.encode(packet.clone(), &mut buffer).unwrap();
-
-        let mut decoded_packets = Vec::new();
-        while let Some(decoded_packet) = codec.decode(&mut buffer).unwrap() {
-            decoded_packets.push(decoded_packet);
-        }
-
-        assert_eq!(decoded_packets.len(), 1);
-        assert_eq!(decoded_packets[0].as_bytes(), packet.as_bytes());
-    }
-
-    #[test]
-    fn encode_a_packat_that_is_too_large() {
-        let mut codec = MultiIpPacketCodec::new();
-        let mut buffer = BytesMut::new();
-
-        let packet = IprPacket::from(Bytes::from_static(
-            &[0u8; MAX_PACKET_SIZE + MAX_PACKET_SIZE],
-        ));
-        codec.encode(packet, &mut buffer).unwrap();
-        assert_eq!(
-            buffer.len(),
-            MAX_PACKET_SIZE + MAX_PACKET_SIZE + LENGTH_PREFIX_SIZE
-        );
-        codec.encode(IprPacket::Flush, &mut buffer).unwrap();
-        assert_eq!(
-            buffer.len(),
-            MAX_PACKET_SIZE + MAX_PACKET_SIZE + LENGTH_PREFIX_SIZE
-        );
-    }
-
-    #[test]
-    fn check_that_max_size_does_not_flush() {
-        let mut codec = MultiIpPacketCodec::new();
-        let mut buffer = BytesMut::new();
-
-        let packet = IprPacket::from(Bytes::from_static(&[0u8; MAX_PACKET_SIZE - 2]));
-        codec.encode(packet.clone(), &mut buffer).unwrap();
-        assert_eq!(buffer.len(), 0);
-
-        let packet = IprPacket::from(Bytes::from_static(&[0u8; MAX_PACKET_SIZE - 2]));
-        codec.encode(packet.clone(), &mut buffer).unwrap();
-        assert_eq!(buffer.len(), MAX_PACKET_SIZE);
+        Ok(Some(packet.freeze()))
    }
 }
@@ -7,9 +7,6 @@ pub const TICKETBOOK_VALIDITY_DAYS: u32 = 7;
 /// Specifies the number of tickets in each issued ticketbook.
 pub const TICKETBOOK_SIZE: u64 = 50;

-/// Specifies the minimum request size each signer must support
-pub const MINIMUM_TICKETBOOK_DATA_REQUEST_SIZE: usize = 50;
-
 /// This type is defined mostly for the purposes of having constants (like sizes) associated with given variants
 /// It's not meant to be serialised or have any fancy traits defined on it (in this crate)
 #[derive(Copy, Clone, Debug, PartialEq)]
@@ -269,9 +269,10 @@ pub fn check_vk_pairing(

 #[cfg(test)]
 mod tests {
-    use super::*;
    use rand::RngCore;

+    use super::*;
+
    #[test]
    fn polynomial_evaluation() {
        // y = 42 (it should be 42 regardless of x)
@@ -4,7 +4,6 @@ use crate::fragment::Fragment;
 use crate::{monitoring, ChunkingError};
 use log::*;
 use std::collections::HashMap;
-use std::time::{Duration, Instant};

 // TODO: perhaps a more sophisticated approach with writing to disk periodically in case
 // we're receiving fast & furious in uncompressed 4K - we don't want to keep that in memory;
@@ -32,9 +31,6 @@ struct ReconstructionBuffer {
    /// appropriately resized and all missing fragments are set to a `None`, thus keeping
    /// everything in order the whole time, allowing for O(1) insertions and O(n) reconstruction.
    fragments: Vec<Option<Fragment>>,
-
-    /// The timestamp of the last received fragment. Used for cleaning up stale buffers.
-    last_fragment_timestamp: Instant,
 }

 /// Type alias representing fully reconstructed message - its original data and list of all
@@ -60,7 +56,6 @@ impl ReconstructionBuffer {
            previous_fragments_set_id: None,
            next_fragments_set_id: None,
            fragments: fragments_buffer,
-            last_fragment_timestamp: Instant::now(),
        }
    }

@@ -104,8 +99,6 @@ impl ReconstructionBuffer {
    /// `previous_fragments_set_id` and `next_fragments_set_id` are set for the ease
    /// of access.
    fn insert_fragment(&mut self, fragment: Fragment) {
-        self.last_fragment_timestamp = Instant::now();
-
        // all fragments in the buffer should always have the same id as before inserting an element,
        // the correct buffer instance is looked up based on the fragment to be inserted.
        debug_assert!({
@@ -165,10 +158,6 @@ pub struct MessageReconstructor {
 }

 impl MessageReconstructor {
-    // We want to be very conservative here. We remove these to avoid memory leaks, but it's okay
-    // to wait for a long time before we do so.
-    const INCOMPLETE_MESSAGE_TIMEOUT: Duration = Duration::from_secs(30 * 60);
-
    /// Creates an empty `MessageReconstructor`.
    pub fn new() -> Self {
        Default::default()
@@ -307,25 +296,6 @@ impl MessageReconstructor {
    pub fn recover_fragment(&self, fragment_data: Vec<u8>) -> Result<Fragment, ChunkingError> {
        Fragment::try_from_bytes(&fragment_data)
    }
-
-    pub fn cleanup_stale_buffers(&mut self) {
-        trace!("Cleaning up stale buffers");
-        let now = Instant::now();
-        self.reconstructed_sets.retain(|_, set_buf| {
-            let keep = now.duration_since(set_buf.last_fragment_timestamp)
-                < Self::INCOMPLETE_MESSAGE_TIMEOUT;
-            if !keep {
-                debug!(
-                    "Removing stale buffer for set id {:?}",
-                    set_buf
-                        .fragments
-                        .first()
-                        .and_then(|f| f.as_ref().map(|f| f.id()))
-                );
-            }
-            keep
-        });
-    }
 }

 #[cfg(test)]
@@ -538,8 +508,6 @@ mod reconstruction_buffer {

 #[cfg(test)]
 mod message_reconstructor {
-    use std::time::Instant;
-
    use super::*;
    use crate::fragment::unlinked_fragment_payload_max_len;
    use crate::set::{max_one_way_linked_set_payload_length, two_way_linked_set_payload_length};
@@ -901,7 +869,6 @@ mod message_reconstructor {
                previous_fragments_set_id: None,
                next_fragments_set_id: None,
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );

@@ -912,7 +879,6 @@ mod message_reconstructor {
                previous_fragments_set_id: None,
                next_fragments_set_id: None,
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );

@@ -1040,7 +1006,6 @@ mod message_reconstructor {
                previous_fragments_set_id: None,
                next_fragments_set_id: Some(1234),
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );

@@ -1051,7 +1016,6 @@ mod message_reconstructor {
                previous_fragments_set_id: Some(12345),
                next_fragments_set_id: Some(123),
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );

@@ -1062,7 +1026,6 @@ mod message_reconstructor {
                previous_fragments_set_id: Some(1234),
                next_fragments_set_id: Some(12),
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );

@@ -1073,7 +1036,6 @@ mod message_reconstructor {
                previous_fragments_set_id: Some(123),
                next_fragments_set_id: None,
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );

@@ -1121,7 +1083,6 @@ mod message_reconstructor {
                previous_fragments_set_id: None,
                next_fragments_set_id: Some(1234),
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );
        reconstructor.reconstructed_sets.insert(
@@ -1131,7 +1092,6 @@ mod message_reconstructor {
                previous_fragments_set_id: Some(12345),
                next_fragments_set_id: None,
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );
        assert_eq!(reconstructor.previous_linked_set_id(12345), None);
@@ -1179,7 +1139,6 @@ mod message_reconstructor {
                previous_fragments_set_id: None,
                next_fragments_set_id: Some(1234),
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );
        reconstructor.reconstructed_sets.insert(
@@ -1189,7 +1148,6 @@ mod message_reconstructor {
                previous_fragments_set_id: Some(12345),
                next_fragments_set_id: None,
                fragments: vec![],
-                last_fragment_timestamp: Instant::now(),
            },
        );
        assert_eq!(reconstructor.next_linked_set_id(12345), Some(1234));
@@ -2,12 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use futures::channel::mpsc;
-use std::{
-    collections::HashMap,
-    time::{Duration, Instant},
-};
-
-const LANE_CONSIDERED_CLEAR: usize = 10;
+use std::collections::HashMap;

 pub type ConnectionId = u64;

@@ -72,32 +67,6 @@ impl LaneQueueLengths {
            }
        }
    }
-
-    pub fn total(&self) -> usize {
-        match self.0.lock() {
-            Ok(inner) => inner.values().sum(),
-            Err(err) => {
-                log::warn!("Failed to get total queue length: {err}");
-                0
-            }
-        }
-    }
-
-    pub async fn wait_until_clear(&self, lane: &TransmissionLane, timeout: Option<Duration>) {
-        let total_time_waited = Instant::now();
-        loop {
-            let lane_length = self.get(lane).unwrap_or_default();
-            if lane_length < LANE_CONSIDERED_CLEAR {
-                break;
-            }
-            if timeout.is_some_and(|timeout| total_time_waited.elapsed() > timeout) {
-                log::warn!("Timeout reached while waiting for queue to clear");
-                break;
-            }
-            log::trace!("Waiting for queue to clear ({} items left)", lane_length);
-            tokio::time::sleep(Duration::from_millis(100)).await;
-        }
-    }
 }

 impl Default for LaneQueueLengths {
@@ -176,7 +176,6 @@ pub struct IssuedTicketbooksFullMerkleProof {
    included_leaves: Vec<MerkleLeaf>,
    total_leaves: usize,
    #[schemars(with = "String")]
-    #[schema(value_type = String)]
    #[serde(with = "nym_serde_helpers::hex")]
    root: Vec<u8>,
 }
@@ -1,7 +1,9 @@
 [workspace]
 resolver = "2"
 members = [
+    #    "coconut-bandwidth",
    "coconut-dkg",
+    "coconut-test",
    "ecash",
    "mixnet",
    "mixnet-vesting-integration-tests",
@@ -31,24 +33,24 @@ overflow-checks = true

 [workspace.dependencies]
 anyhow = "1.0.86"
-bs58 = "0.5.1"
-cosmwasm-crypto = "=2.2.2"
-cosmwasm-derive = "=2.2.2"
-cosmwasm-schema = "=2.2.2"
-cosmwasm-std = "=2.2.2"
-cw-controllers = "=2.0.0"
-cw-multi-test = "=2.3.2"
-cw-storage-plus = "=2.0.0"
-cw-utils = "=2.0.0"
-cw2 = "=2.0.0"
-cw3 = "=2.0.0"
-cw3-fixed-multisig = "=2.0.0"
-cw4 = "=2.0.0"
-cw20 = "=2.0.0"
-cw20-base = "2.0.0"
+bs58 = "0.4.0"
+cosmwasm-crypto = "=1.4.3"
+cosmwasm-derive = "=1.4.3"
+cosmwasm-schema = "=1.4.3"
+cosmwasm-std = "=1.4.3"
+cosmwasm-storage = "=1.4.3"
+cw-controllers = "=1.1.0"
+cw-multi-test = "=0.16.5"
+cw-storage-plus = "=1.2.0"
+cw-utils = "=1.0.1"
+cw2 = "=1.1.2"
+cw3 = "=1.1.2"
+cw3-fixed-multisig = "=1.1.2"
+cw4 = "=1.1.2"
+cw20 = "=1.1.2"
 semver = "1.0.21"
 serde = "1.0.196"
-sylvia = "1.3.3"
+sylvia = "0.8.0"
 schemars = "0.8.16"

-thiserror = "2.0.11"
+thiserror = "1.0.48"
@@ -1,5 +1,8 @@
 schema: coconut-dkg-schema mixnet-schema vesting-schema multisig-schema group-schema ecash-schema

+#coconut-bandwidth-schema:
+#	$(MAKE) -C coconut-bandwidth generate-schema
+
 coconut-dkg-schema:
 	$(MAKE) -C coconut-dkg generate-schema

@@ -0,0 +1,4 @@
+[alias]
+wasm = "build --release --lib --target wasm32-unknown-unknown"
+unit-test = "test --lib"
+schema = "run --bin schema --features=schema-gen"
@@ -0,0 +1,29 @@
+[package]
+name = "nym-coconut-bandwidth"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bin]]
+name = "schema"
+required-features = ["schema-gen"]
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+nym-coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
+nym-multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" }
+
+cosmwasm-std = { workspace = true }
+cosmwasm-schema = { workspace = true, optional = true }
+cosmwasm-storage = { workspace = true }
+cw-storage-plus = { workspace = true }
+cw-controllers = { workspace = true }
+
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
+
+[features]
+schema-gen = ["nym-coconut-bandwidth-contract-common/schema", "cosmwasm-schema"]
@@ -0,0 +1,2 @@
+generate-schema:
+	cargo schema
@@ -0,0 +1,382 @@
+{
+  "contract_name": "nym-coconut-bandwidth",
+  "contract_version": "0.1.0",
+  "idl_version": "1.0.0",
+  "instantiate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "InstantiateMsg",
+    "type": "object",
+    "required": [
+      "mix_denom",
+      "multisig_addr",
+      "pool_addr"
+    ],
+    "properties": {
+      "mix_denom": {
+        "type": "string"
+      },
+      "multisig_addr": {
+        "type": "string"
+      },
+      "pool_addr": {
+        "type": "string"
+      }
+    },
+    "additionalProperties": false
+  },
+  "execute": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "ExecuteMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "deposit_funds"
+        ],
+        "properties": {
+          "deposit_funds": {
+            "type": "object",
+            "required": [
+              "data"
+            ],
+            "properties": {
+              "data": {
+                "$ref": "#/definitions/DepositData"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "spend_credential"
+        ],
+        "properties": {
+          "spend_credential": {
+            "type": "object",
+            "required": [
+              "data"
+            ],
+            "properties": {
+              "data": {
+                "$ref": "#/definitions/SpendCredentialData"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "release_funds"
+        ],
+        "properties": {
+          "release_funds": {
+            "type": "object",
+            "required": [
+              "funds"
+            ],
+            "properties": {
+              "funds": {
+                "$ref": "#/definitions/Coin"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ],
+    "definitions": {
+      "Coin": {
+        "type": "object",
+        "required": [
+          "amount",
+          "denom"
+        ],
+        "properties": {
+          "amount": {
+            "$ref": "#/definitions/Uint128"
+          },
+          "denom": {
+            "type": "string"
+          }
+        }
+      },
+      "DepositData": {
+        "type": "object",
+        "required": [
+          "deposit_info",
+          "encryption_key",
+          "identity_key"
+        ],
+        "properties": {
+          "deposit_info": {
+            "type": "string"
+          },
+          "encryption_key": {
+            "type": "string"
+          },
+          "identity_key": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "SpendCredentialData": {
+        "type": "object",
+        "required": [
+          "blinded_serial_number",
+          "funds",
+          "gateway_cosmos_address"
+        ],
+        "properties": {
+          "blinded_serial_number": {
+            "type": "string"
+          },
+          "funds": {
+            "$ref": "#/definitions/Coin"
+          },
+          "gateway_cosmos_address": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false
+      },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      }
+    }
+  },
+  "query": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "QueryMsg",
+    "oneOf": [
+      {
+        "type": "object",
+        "required": [
+          "get_spent_credential"
+        ],
+        "properties": {
+          "get_spent_credential": {
+            "type": "object",
+            "required": [
+              "blinded_serial_number"
+            ],
+            "properties": {
+              "blinded_serial_number": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "get_all_spent_credentials"
+        ],
+        "properties": {
+          "get_all_spent_credentials": {
+            "type": "object",
+            "properties": {
+              "limit": {
+                "type": [
+                  "integer",
+                  "null"
+                ],
+                "format": "uint32",
+                "minimum": 0.0
+              },
+              "start_after": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      }
+    ]
+  },
+  "migrate": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "MigrateMsg",
+    "type": "object",
+    "additionalProperties": false
+  },
+  "sudo": null,
+  "responses": {
+    "get_all_spent_credentials": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "PagedSpendCredentialResponse",
+      "type": "object",
+      "required": [
+        "per_page",
+        "spend_credentials"
+      ],
+      "properties": {
+        "per_page": {
+          "type": "integer",
+          "format": "uint",
+          "minimum": 0.0
+        },
+        "spend_credentials": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SpendCredential"
+          }
+        },
+        "start_next_after": {
+          "description": "Field indicating paging information for the following queries if the caller wishes to get further entries.",
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "SpendCredential": {
+          "type": "object",
+          "required": [
+            "blinded_serial_number",
+            "funds",
+            "gateway_cosmos_address",
+            "status"
+          ],
+          "properties": {
+            "blinded_serial_number": {
+              "type": "string"
+            },
+            "funds": {
+              "$ref": "#/definitions/Coin"
+            },
+            "gateway_cosmos_address": {
+              "$ref": "#/definitions/Addr"
+            },
+            "status": {
+              "$ref": "#/definitions/SpendCredentialStatus"
+            }
+          },
+          "additionalProperties": false
+        },
+        "SpendCredentialStatus": {
+          "type": "string",
+          "enum": [
+            "in_progress",
+            "spent"
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    },
+    "get_spent_credential": {
+      "$schema": "http://json-schema.org/draft-07/schema#",
+      "title": "SpendCredentialResponse",
+      "type": "object",
+      "properties": {
+        "spend_credential": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/SpendCredential"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false,
+      "definitions": {
+        "Addr": {
+          "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+          "type": "string"
+        },
+        "Coin": {
+          "type": "object",
+          "required": [
+            "amount",
+            "denom"
+          ],
+          "properties": {
+            "amount": {
+              "$ref": "#/definitions/Uint128"
+            },
+            "denom": {
+              "type": "string"
+            }
+          }
+        },
+        "SpendCredential": {
+          "type": "object",
+          "required": [
+            "blinded_serial_number",
+            "funds",
+            "gateway_cosmos_address",
+            "status"
+          ],
+          "properties": {
+            "blinded_serial_number": {
+              "type": "string"
+            },
+            "funds": {
+              "$ref": "#/definitions/Coin"
+            },
+            "gateway_cosmos_address": {
+              "$ref": "#/definitions/Addr"
+            },
+            "status": {
+              "$ref": "#/definitions/SpendCredentialStatus"
+            }
+          },
+          "additionalProperties": false
+        },
+        "SpendCredentialStatus": {
+          "type": "string",
+          "enum": [
+            "in_progress",
+            "spent"
+          ]
+        },
+        "Uint128": {
+          "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+          "type": "string"
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,130 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "ExecuteMsg",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "deposit_funds"
+      ],
+      "properties": {
+        "deposit_funds": {
+          "type": "object",
+          "required": [
+            "data"
+          ],
+          "properties": {
+            "data": {
+              "$ref": "#/definitions/DepositData"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "spend_credential"
+      ],
+      "properties": {
+        "spend_credential": {
+          "type": "object",
+          "required": [
+            "data"
+          ],
+          "properties": {
+            "data": {
+              "$ref": "#/definitions/SpendCredentialData"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "release_funds"
+      ],
+      "properties": {
+        "release_funds": {
+          "type": "object",
+          "required": [
+            "funds"
+          ],
+          "properties": {
+            "funds": {
+              "$ref": "#/definitions/Coin"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ],
+  "definitions": {
+    "Coin": {
+      "type": "object",
+      "required": [
+        "amount",
+        "denom"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "denom": {
+          "type": "string"
+        }
+      }
+    },
+    "DepositData": {
+      "type": "object",
+      "required": [
+        "deposit_info",
+        "encryption_key",
+        "identity_key"
+      ],
+      "properties": {
+        "deposit_info": {
+          "type": "string"
+        },
+        "encryption_key": {
+          "type": "string"
+        },
+        "identity_key": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "SpendCredentialData": {
+      "type": "object",
+      "required": [
+        "blinded_serial_number",
+        "funds",
+        "gateway_cosmos_address"
+      ],
+      "properties": {
+        "blinded_serial_number": {
+          "type": "string"
+        },
+        "funds": {
+          "$ref": "#/definitions/Coin"
+        },
+        "gateway_cosmos_address": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    }
+  }
+}
@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "InstantiateMsg",
+  "type": "object",
+  "required": [
+    "mix_denom",
+    "multisig_addr",
+    "pool_addr"
+  ],
+  "properties": {
+    "mix_denom": {
+      "type": "string"
+    },
+    "multisig_addr": {
+      "type": "string"
+    },
+    "pool_addr": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}
@@ -0,0 +1,6 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "MigrateMsg",
+  "type": "object",
+  "additionalProperties": false
+}
@@ -0,0 +1,56 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "QueryMsg",
+  "oneOf": [
+    {
+      "type": "object",
+      "required": [
+        "get_spent_credential"
+      ],
+      "properties": {
+        "get_spent_credential": {
+          "type": "object",
+          "required": [
+            "blinded_serial_number"
+          ],
+          "properties": {
+            "blinded_serial_number": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "get_all_spent_credentials"
+      ],
+      "properties": {
+        "get_all_spent_credentials": {
+          "type": "object",
+          "properties": {
+            "limit": {
+              "type": [
+                "integer",
+                "null"
+              ],
+              "format": "uint32",
+              "minimum": 0.0
+            },
+            "start_after": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    }
+  ]
+}
@@ -0,0 +1,86 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "PagedSpendCredentialResponse",
+  "type": "object",
+  "required": [
+    "per_page",
+    "spend_credentials"
+  ],
+  "properties": {
+    "per_page": {
+      "type": "integer",
+      "format": "uint",
+      "minimum": 0.0
+    },
+    "spend_credentials": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/SpendCredential"
+      }
+    },
+    "start_next_after": {
+      "description": "Field indicating paging information for the following queries if the caller wishes to get further entries.",
+      "type": [
+        "string",
+        "null"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "Coin": {
+      "type": "object",
+      "required": [
+        "amount",
+        "denom"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "denom": {
+          "type": "string"
+        }
+      }
+    },
+    "SpendCredential": {
+      "type": "object",
+      "required": [
+        "blinded_serial_number",
+        "funds",
+        "gateway_cosmos_address",
+        "status"
+      ],
+      "properties": {
+        "blinded_serial_number": {
+          "type": "string"
+        },
+        "funds": {
+          "$ref": "#/definitions/Coin"
+        },
+        "gateway_cosmos_address": {
+          "$ref": "#/definitions/Addr"
+        },
+        "status": {
+          "$ref": "#/definitions/SpendCredentialStatus"
+        }
+      },
+      "additionalProperties": false
+    },
+    "SpendCredentialStatus": {
+      "type": "string",
+      "enum": [
+        "in_progress",
+        "spent"
+      ]
+    },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    }
+  }
+}
@@ -0,0 +1,74 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "SpendCredentialResponse",
+  "type": "object",
+  "properties": {
+    "spend_credential": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/SpendCredential"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "definitions": {
+    "Addr": {
+      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
+      "type": "string"
+    },
+    "Coin": {
+      "type": "object",
+      "required": [
+        "amount",
+        "denom"
+      ],
+      "properties": {
+        "amount": {
+          "$ref": "#/definitions/Uint128"
+        },
+        "denom": {
+          "type": "string"
+        }
+      }
+    },
+    "SpendCredential": {
+      "type": "object",
+      "required": [
+        "blinded_serial_number",
+        "funds",
+        "gateway_cosmos_address",
+        "status"
+      ],
+      "properties": {
+        "blinded_serial_number": {
+          "type": "string"
+        },
+        "funds": {
+          "$ref": "#/definitions/Coin"
+        },
+        "gateway_cosmos_address": {
+          "$ref": "#/definitions/Addr"
+        },
+        "status": {
+          "$ref": "#/definitions/SpendCredentialStatus"
+        }
+      },
+      "additionalProperties": false
+    },
+    "SpendCredentialStatus": {
+      "type": "string",
+      "enum": [
+        "in_progress",
+        "spent"
+      ]
+    },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    }
+  }
+}
@@ -0,0 +1,16 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_schema::write_api;
+use nym_coconut_bandwidth_contract_common::msg::{
+    ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
+};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        query: QueryMsg,
+        execute: ExecuteMsg,
+        migrate: MigrateMsg,
+    }
+}
@@ -0,0 +1,110 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{
+    entry_point, to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult,
+};
+
+use nym_coconut_bandwidth_contract_common::msg::{
+    ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
+};
+
+use crate::error::ContractError;
+use crate::queries::{query_all_spent_credentials_paged, query_spent_credential};
+use crate::state::{Config, ADMIN, CONFIG};
+use crate::transactions;
+
+/// Instantiate the contract.
+///
+/// `deps` contains Storage, API and Querier
+/// `msg` is the contract initialization message, sort of like a constructor call.
+#[entry_point]
+pub fn instantiate(
+    mut deps: DepsMut<'_>,
+    _env: Env,
+    _info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
+    let pool_addr = deps.api.addr_validate(&msg.pool_addr)?;
+    let mix_denom = msg.mix_denom;
+
+    ADMIN.set(deps.branch(), Some(multisig_addr.clone()))?;
+
+    let cfg = Config {
+        multisig_addr,
+        pool_addr,
+        mix_denom,
+    };
+    CONFIG.save(deps.storage, &cfg)?;
+
+    Ok(Response::default())
+}
+
+/// Handle an incoming message
+#[entry_point]
+pub fn execute(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    msg: ExecuteMsg,
+) -> Result<Response, ContractError> {
+    match msg {
+        ExecuteMsg::DepositFunds { data } => transactions::deposit_funds(deps, env, info, data),
+        ExecuteMsg::SpendCredential { data } => {
+            transactions::spend_credential(deps, env, info, data)
+        }
+        ExecuteMsg::ReleaseFunds { funds } => transactions::release_funds(deps, env, info, funds),
+    }
+}
+
+#[entry_point]
+pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
+    match msg {
+        QueryMsg::GetAllSpentCredentials { limit, start_after } => to_binary(
+            &query_all_spent_credentials_paged(deps, start_after, limit)?,
+        ),
+        QueryMsg::GetSpentCredential {
+            blinded_serial_number,
+        } => to_binary(&query_spent_credential(deps, blinded_serial_number)?),
+    }
+}
+
+#[entry_point]
+pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    Ok(Default::default())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::TEST_MIX_DENOM;
+    use crate::support::tests::helpers::*;
+    use cosmwasm_std::coins;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+
+    #[test]
+    fn initialize_contract() {
+        let mut deps = mock_dependencies();
+        let env = mock_env();
+        let msg = InstantiateMsg {
+            multisig_addr: String::from(MULTISIG_CONTRACT),
+            pool_addr: String::from(POOL_CONTRACT),
+            mix_denom: TEST_MIX_DENOM.to_string(),
+        };
+        let info = mock_info("creator", &[]);
+
+        let res = instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+        assert_eq!(0, res.messages.len());
+
+        // Contract balance should be 0
+        assert_eq!(
+            coins(0, TEST_MIX_DENOM),
+            vec![deps
+                .as_ref()
+                .querier
+                .query_balance(env.contract.address, TEST_MIX_DENOM)
+                .unwrap()]
+        );
+    }
+}
@@ -0,0 +1,34 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::StdError;
+use cw_controllers::AdminError;
+use thiserror::Error;
+
+/// Custom errors for contract failure conditions.
+///
+/// Add any other custom errors you like here.
+/// Look at https://docs.rs/thiserror/1.0.21/thiserror/ for details.
+#[derive(Error, Debug, PartialEq)]
+pub enum ContractError {
+    #[error(transparent)]
+    Std(#[from] StdError),
+
+    #[error("Received multiple coin types")]
+    MultipleDenoms,
+
+    #[error("No coin was sent for voucher")]
+    NoCoin,
+
+    #[error("Wrong coin denomination, you must send {mix_denom}")]
+    WrongDenom { mix_denom: String },
+
+    #[error("There aren't enough funds in the contract")]
+    NotEnoughFunds,
+
+    #[error("Credential already spent or in process of spending")]
+    DuplicateBlindedSerialNumber,
+
+    #[error(transparent)]
+    Admin(#[from] AdminError),
+}
@@ -0,0 +1,10 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod contract;
+pub mod error;
+mod queries;
+mod state;
+mod storage;
+mod support;
+mod transactions;
@@ -0,0 +1,178 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{Deps, Order, StdResult};
+use cw_storage_plus::Bound;
+use nym_coconut_bandwidth_contract_common::spend_credential::{
+    PagedSpendCredentialResponse, SpendCredential, SpendCredentialResponse,
+};
+
+use crate::storage::{self, SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT, SPEND_CREDENTIAL_PAGE_MAX_LIMIT};
+
+pub(crate) fn query_all_spent_credentials_paged(
+    deps: Deps<'_>,
+    start_after: Option<String>,
+    limit: Option<u32>,
+) -> StdResult<PagedSpendCredentialResponse> {
+    let limit = limit
+        .unwrap_or(SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT)
+        .min(SPEND_CREDENTIAL_PAGE_MAX_LIMIT) as usize;
+
+    let start = start_after.as_deref().map(Bound::exclusive);
+
+    let nodes = storage::spent_credentials()
+        .range(deps.storage, start, None, Order::Ascending)
+        .take(limit)
+        .map(|res| res.map(|item| item.1))
+        .collect::<StdResult<Vec<SpendCredential>>>()?;
+
+    let start_next_after = nodes
+        .last()
+        .map(|spend_credential| spend_credential.blinded_serial_number().to_string());
+
+    Ok(PagedSpendCredentialResponse::new(
+        nodes,
+        limit,
+        start_next_after,
+    ))
+}
+
+pub(crate) fn query_spent_credential(
+    deps: Deps<'_>,
+    blinded_serial_number: String,
+) -> StdResult<SpendCredentialResponse> {
+    let spend_credential =
+        storage::spent_credentials().may_load(deps.storage, &blinded_serial_number)?;
+    Ok(SpendCredentialResponse::new(spend_credential))
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::spend_credential_data_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use crate::transactions::spend_credential;
+    use cosmwasm_std::testing::{mock_env, mock_info};
+
+    #[test]
+    fn spent_credentials_empty_on_init() {
+        let deps = init_contract();
+        let response =
+            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(2)).unwrap();
+        assert_eq!(0, response.spend_credentials.len());
+    }
+
+    #[test]
+    fn spent_credentials_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+        let limit = 2;
+        for n in 0..1000 {
+            let data = spend_credential_data_fixture(&format!("blinded_serial_number{}", n));
+            spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
+        }
+
+        let page1 =
+            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(limit)).unwrap();
+        assert_eq!(limit, page1.spend_credentials.len() as u32);
+    }
+
+    #[test]
+    fn spent_credentials_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+        for n in 0..1000 {
+            let data = spend_credential_data_fixture(&format!("blinded_serial_number{}", n));
+            spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
+        }
+
+        // query without explicitly setting a limit
+        let page1 = query_all_spent_credentials_paged(deps.as_ref(), None, None).unwrap();
+
+        assert_eq!(
+            SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT,
+            page1.spend_credentials.len() as u32
+        );
+    }
+
+    #[test]
+    fn spent_credentials_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+        for n in 0..1000 {
+            let data = spend_credential_data_fixture(&format!("blinded_serial_number{}", n));
+            spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
+        }
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * SPEND_CREDENTIAL_PAGE_MAX_LIMIT;
+        let page1 =
+            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(crazy_limit))
+                .unwrap();
+
+        // we default to a decent sized upper bound instead
+        let expected_limit = SPEND_CREDENTIAL_PAGE_MAX_LIMIT;
+        assert_eq!(expected_limit, page1.spend_credentials.len() as u32);
+    }
+
+    #[test]
+    fn spent_credentials_pagination_works() {
+        let mut deps = init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+
+        let data = spend_credential_data_fixture("blinded_serial_number1");
+        spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
+
+        let per_page = 2;
+        let page1 =
+            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+
+        // page should have 1 result on it
+        assert_eq!(1, page1.spend_credentials.len());
+
+        // save another
+        let data = spend_credential_data_fixture("blinded_serial_number2");
+        spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
+
+        // page1 should have 2 results on it
+        let page1 =
+            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.spend_credentials.len());
+
+        let data = spend_credential_data_fixture("blinded_serial_number3");
+        spend_credential(deps.as_mut(), env.clone(), info.clone(), data).unwrap();
+
+        // page1 still has 2 results
+        let page1 =
+            query_all_spent_credentials_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.spend_credentials.len());
+
+        // retrieving the next page should start after the last key on this page
+        let start_after = page1.start_next_after.unwrap();
+        let page2 = query_all_spent_credentials_paged(
+            deps.as_ref(),
+            Option::from(start_after.clone()),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        assert_eq!(1, page2.spend_credentials.len());
+
+        let data = spend_credential_data_fixture("blinded_serial_number4");
+        spend_credential(deps.as_mut(), env, info, data).unwrap();
+
+        let page2 = query_all_spent_credentials_paged(
+            deps.as_ref(),
+            Option::from(start_after),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        // now we have 2 pages, with 2 results on the second page
+        assert_eq!(2, page2.spend_credentials.len());
+    }
+}
@@ -0,0 +1,18 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::Addr;
+use cw_controllers::Admin;
+use cw_storage_plus::Item;
+use serde::{Deserialize, Serialize};
+
+pub const ADMIN: Admin = Admin::new("admin");
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
+pub struct Config {
+    pub multisig_addr: Addr,
+    pub pool_addr: Addr,
+    pub mix_denom: String,
+}
+
+pub const CONFIG: Item<Config> = Item::new("config");
@@ -0,0 +1,106 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cw_storage_plus::{Index, IndexList, IndexedMap, UniqueIndex};
+use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredential;
+
+// storage prefixes
+const SPEND_CREDENTIAL_PK_NAMESPACE: &str = "sc";
+const SPEND_CREDENTIAL_BLINDED_SERIAL_NO_IDX_NAMESPACE: &str = "scn";
+
+// paged retrieval limits for all queries and transactions
+pub(crate) const SPEND_CREDENTIAL_PAGE_MAX_LIMIT: u32 = 75;
+pub(crate) const SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT: u32 = 50;
+
+pub(crate) struct SpendCredentialIndex<'a> {
+    pub(crate) blinded_serial_number: UniqueIndex<'a, String, SpendCredential>,
+}
+
+// IndexList is just boilerplate code for fetching a struct's indexes
+// note that from my understanding this will be converted into a macro at some point in the future
+impl IndexList<SpendCredential> for SpendCredentialIndex<'_> {
+    fn get_indexes(&'_ self) -> Box<dyn Iterator<Item = &'_ dyn Index<SpendCredential>> + '_> {
+        let v: Vec<&dyn Index<SpendCredential>> = vec![&self.blinded_serial_number];
+        Box::new(v.into_iter())
+    }
+}
+
+// spent_credentials() is the storage access function.
+pub(crate) fn spent_credentials<'a>(
+) -> IndexedMap<'a, &'a str, SpendCredential, SpendCredentialIndex<'a>> {
+    let indexes = SpendCredentialIndex {
+        blinded_serial_number: UniqueIndex::new(
+            |d| d.blinded_serial_number().to_string(),
+            SPEND_CREDENTIAL_BLINDED_SERIAL_NO_IDX_NAMESPACE,
+        ),
+    };
+    IndexedMap::new(SPEND_CREDENTIAL_PK_NAMESPACE, indexes)
+}
+
+// currently not used outside tests
+#[cfg(test)]
+mod tests {
+    use super::super::storage;
+    use crate::storage::SpendCredential;
+    use crate::support::tests::fixtures;
+    use crate::support::tests::fixtures::TEST_MIX_DENOM;
+    use cosmwasm_std::testing::MockStorage;
+    use cosmwasm_std::Addr;
+    use cosmwasm_std::Coin;
+    use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialStatus;
+
+    #[test]
+    fn spend_credential_single_read_retrieval() {
+        let mut storage = MockStorage::new();
+        let blind_serial_number1 = "number1";
+        let blind_serial_number2 = "number2";
+        let spend1 = fixtures::spend_credential_fixture(blind_serial_number1);
+        let spend2 = fixtures::spend_credential_fixture(blind_serial_number2);
+        storage::spent_credentials()
+            .save(&mut storage, blind_serial_number1, &spend1)
+            .unwrap();
+        storage::spent_credentials()
+            .save(&mut storage, blind_serial_number2, &spend2)
+            .unwrap();
+
+        let res1 = storage::spent_credentials()
+            .load(&storage, blind_serial_number1)
+            .unwrap();
+        let res2 = storage::spent_credentials()
+            .load(&storage, blind_serial_number2)
+            .unwrap();
+        assert_eq!(spend1, res1);
+        assert_eq!(spend2, res2);
+    }
+
+    #[test]
+    fn mark_as_spent_credential() {
+        let mut mock_storage = MockStorage::new();
+        let funds = Coin::new(100, TEST_MIX_DENOM);
+        let blind_serial_number = "blind_serial_number";
+        let gateway_cosmos_address: Addr = Addr::unchecked("gateway_cosmos_address");
+
+        let res = storage::spent_credentials()
+            .may_load(&mock_storage, blind_serial_number)
+            .unwrap();
+        assert!(res.is_none());
+
+        let mut spend_credential = SpendCredential::new(
+            funds,
+            blind_serial_number.to_string(),
+            gateway_cosmos_address,
+        );
+        spend_credential.mark_as_spent();
+
+        storage::spent_credentials()
+            .save(&mut mock_storage, blind_serial_number, &spend_credential)
+            .unwrap();
+
+        let ret = storage::spent_credentials()
+            .load(&mock_storage, blind_serial_number)
+            .unwrap();
+
+        assert_eq!(ret, spend_credential);
+        assert_eq!(ret.status(), SpendCredentialStatus::Spent);
+    }
+}
@@ -0,0 +1,5 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+pub mod tests;
@@ -0,0 +1,25 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{Addr, Coin};
+use nym_coconut_bandwidth_contract_common::spend_credential::{
+    SpendCredential, SpendCredentialData,
+};
+
+pub const TEST_MIX_DENOM: &str = "unym";
+
+pub fn spend_credential_fixture(blinded_serial_number: &str) -> SpendCredential {
+    SpendCredential::new(
+        Coin::new(100, TEST_MIX_DENOM),
+        blinded_serial_number.to_string(),
+        Addr::unchecked("gateway_owner_addr"),
+    )
+}
+
+pub fn spend_credential_data_fixture(blinded_serial_number: &str) -> SpendCredentialData {
+    SpendCredentialData::new(
+        Coin::new(100, TEST_MIX_DENOM),
+        blinded_serial_number.to_string(),
+        "gateway_owner_addr".to_string(),
+    )
+}
@@ -0,0 +1,25 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub const MULTISIG_CONTRACT: &str = "multisig contract address";
+pub const POOL_CONTRACT: &str = "mix pool contract address";
+
+use crate::contract::instantiate;
+use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
+use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps};
+use nym_coconut_bandwidth_contract_common::msg::InstantiateMsg;
+
+use super::fixtures::TEST_MIX_DENOM;
+
+pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
+    let mut deps = mock_dependencies();
+    let msg = InstantiateMsg {
+        multisig_addr: String::from(MULTISIG_CONTRACT),
+        pool_addr: String::from(POOL_CONTRACT),
+        mix_denom: TEST_MIX_DENOM.to_string(),
+    };
+    let env = mock_env();
+    let info = mock_info("creator", &[]);
+    instantiate(deps.as_mut(), env, info, msg).unwrap();
+    deps
+}
@@ -0,0 +1,5 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod fixtures;
+pub mod helpers;
@@ -0,0 +1,369 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use cosmwasm_std::{BankMsg, Coin, DepsMut, Env, Event, MessageInfo, Response};
+use nym_coconut_bandwidth_contract_common::spend_credential::{
+    to_cosmos_msg, SpendCredential, SpendCredentialData,
+};
+
+use crate::error::ContractError;
+use crate::state::{ADMIN, CONFIG};
+use crate::storage;
+
+use nym_coconut_bandwidth_contract_common::deposit::DepositData;
+use nym_coconut_bandwidth_contract_common::events::{
+    DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO,
+    DEPOSIT_VALUE,
+};
+
+pub(crate) fn deposit_funds(
+    deps: DepsMut<'_>,
+    _env: Env,
+    info: MessageInfo,
+    data: DepositData,
+) -> Result<Response, ContractError> {
+    if info.funds.is_empty() {
+        return Err(ContractError::NoCoin);
+    }
+    if info.funds.len() > 1 {
+        return Err(ContractError::MultipleDenoms);
+    }
+    let mix_denom = CONFIG.load(deps.storage)?.mix_denom;
+    if info.funds[0].denom != mix_denom {
+        return Err(ContractError::WrongDenom { mix_denom });
+    }
+
+    let voucher_value = info.funds.last().unwrap();
+    let event = Event::new(DEPOSITED_FUNDS_EVENT_TYPE)
+        .add_attribute(DEPOSIT_VALUE, voucher_value.amount)
+        .add_attribute(DEPOSIT_INFO, data.deposit_info())
+        .add_attribute(DEPOSIT_IDENTITY_KEY, data.identity_key())
+        .add_attribute(DEPOSIT_ENCRYPTION_KEY, data.encryption_key());
+
+    Ok(Response::new().add_event(event))
+}
+
+pub(crate) fn spend_credential(
+    deps: DepsMut<'_>,
+    env: Env,
+    _info: MessageInfo,
+    data: SpendCredentialData,
+) -> Result<Response, ContractError> {
+    let mix_denom = CONFIG.load(deps.storage)?.mix_denom;
+    if data.funds().denom != mix_denom {
+        return Err(ContractError::WrongDenom { mix_denom });
+    }
+    if storage::spent_credentials().has(deps.storage, data.blinded_serial_number()) {
+        return Err(ContractError::DuplicateBlindedSerialNumber);
+    }
+    let cfg = CONFIG.load(deps.storage)?;
+
+    let gateway_cosmos_address = deps.api.addr_validate(data.gateway_cosmos_address())?;
+    storage::spent_credentials().save(
+        deps.storage,
+        data.blinded_serial_number(),
+        &SpendCredential::new(
+            data.funds().to_owned(),
+            data.blinded_serial_number().to_owned(),
+            gateway_cosmos_address,
+        ),
+    )?;
+
+    let msg = to_cosmos_msg(
+        data.funds().clone(),
+        data.blinded_serial_number().to_string(),
+        env.contract.address.into_string(),
+        cfg.multisig_addr.into_string(),
+    )?;
+
+    Ok(Response::new().add_message(msg))
+}
+
+pub(crate) fn release_funds(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    funds: Coin,
+) -> Result<Response, ContractError> {
+    let mix_denom = CONFIG.load(deps.storage)?.mix_denom;
+    if funds.denom != mix_denom {
+        return Err(ContractError::WrongDenom { mix_denom });
+    }
+    let current_balance = deps
+        .querier
+        .query_balance(env.contract.address, mix_denom)?;
+    if funds.amount > current_balance.amount {
+        return Err(ContractError::NotEnoughFunds);
+    }
+    ADMIN.assert_admin(deps.as_ref(), &info.sender)?;
+
+    let cfg = CONFIG.load(deps.storage)?;
+
+    let return_tokens = BankMsg::Send {
+        to_address: cfg.pool_addr.into(),
+        amount: vec![funds],
+    };
+    let response = Response::new().add_message(return_tokens);
+
+    Ok(response)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::spend_credential_data_fixture;
+    use crate::support::tests::helpers::{self, MULTISIG_CONTRACT, POOL_CONTRACT};
+    use cosmwasm_std::testing::{mock_env, mock_info};
+    use cosmwasm_std::{from_binary, CosmosMsg, WasmMsg};
+    use cw_controllers::AdminError;
+    use nym_coconut_bandwidth_contract_common::msg::ExecuteMsg;
+    use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg;
+
+    #[test]
+    fn invalid_deposit() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+
+        let deposit_info = String::from("Deposit info");
+        let verification_key = String::from("Verification key");
+        let encryption_key = String::from("Encryption key");
+        let data = DepositData::new(deposit_info, verification_key, encryption_key);
+
+        assert_eq!(
+            deposit_funds(deps.as_mut(), env.clone(), info, data.clone()),
+            Err(ContractError::NoCoin)
+        );
+
+        let coin = Coin::new(1000000, crate::support::tests::fixtures::TEST_MIX_DENOM);
+        let second_coin = Coin::new(1000000, "some_denom");
+
+        let info = mock_info("requester", &[coin, second_coin.clone()]);
+        assert_eq!(
+            deposit_funds(deps.as_mut(), env.clone(), info, data.clone()),
+            Err(ContractError::MultipleDenoms)
+        );
+
+        let info = mock_info("requester", &[second_coin]);
+        assert_eq!(
+            deposit_funds(deps.as_mut(), env, info, data),
+            Err(ContractError::WrongDenom {
+                mix_denom: crate::support::tests::fixtures::TEST_MIX_DENOM.to_string()
+            })
+        );
+    }
+
+    #[test]
+    fn valid_deposit() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+
+        let deposit_info = String::from("Deposit info");
+        let verification_key = String::from("Verification key");
+        let encryption_key = String::from("Encryption key");
+        let deposit_value = 424242;
+        let data = DepositData::new(
+            deposit_info.clone(),
+            verification_key.clone(),
+            encryption_key.clone(),
+        );
+        let coin = Coin::new(
+            deposit_value,
+            crate::support::tests::fixtures::TEST_MIX_DENOM,
+        );
+        let info = mock_info("requester", &[coin]);
+
+        let tx = deposit_funds(deps.as_mut(), env, info, data).unwrap();
+
+        let events: Vec<_> = tx
+            .events
+            .iter()
+            .filter(|event| event.ty == DEPOSITED_FUNDS_EVENT_TYPE)
+            .collect();
+        assert_eq!(events.len(), 1);
+
+        let event = events[0];
+        assert_eq!(event.attributes.len(), 4);
+
+        let deposit_attr = event
+            .attributes
+            .iter()
+            .find(|attr| attr.key == DEPOSIT_VALUE)
+            .unwrap();
+        assert_eq!(deposit_attr.value, deposit_value.to_string());
+
+        let info_attr = event
+            .attributes
+            .iter()
+            .find(|attr| attr.key == DEPOSIT_INFO)
+            .unwrap();
+        assert_eq!(info_attr.value, deposit_info);
+
+        let verification_key_attr = event
+            .attributes
+            .iter()
+            .find(|attr| attr.key == DEPOSIT_IDENTITY_KEY)
+            .unwrap();
+        assert_eq!(verification_key_attr.value, verification_key);
+
+        let encryption_key_attr = event
+            .attributes
+            .iter()
+            .find(|attr| attr.key == DEPOSIT_ENCRYPTION_KEY)
+            .unwrap();
+        assert_eq!(encryption_key_attr.value, encryption_key);
+    }
+
+    #[test]
+    fn invalid_release() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let invalid_admin = "invalid admin";
+        let funds = Coin::new(1, crate::support::tests::fixtures::TEST_MIX_DENOM);
+
+        let err = release_funds(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(invalid_admin, &[]),
+            Coin::new(1, "invalid denom"),
+        )
+        .unwrap_err();
+        assert_eq!(
+            err,
+            ContractError::WrongDenom {
+                mix_denom: crate::support::tests::fixtures::TEST_MIX_DENOM.to_string()
+            }
+        );
+
+        let err = release_funds(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(invalid_admin, &[]),
+            funds.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(err, ContractError::NotEnoughFunds);
+
+        deps.querier
+            .update_balance(env.contract.address.clone(), vec![funds.clone()]);
+        let err =
+            release_funds(deps.as_mut(), env, mock_info(invalid_admin, &[]), funds).unwrap_err();
+        assert_eq!(err, ContractError::Admin(AdminError::NotAdmin {}));
+    }
+
+    #[test]
+    fn valid_release() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let coin = Coin::new(1, crate::support::tests::fixtures::TEST_MIX_DENOM);
+
+        deps.querier
+            .update_balance(env.contract.address.clone(), vec![coin.clone()]);
+        let res = release_funds(
+            deps.as_mut(),
+            env,
+            mock_info(MULTISIG_CONTRACT, &[]),
+            coin.clone(),
+        )
+        .unwrap();
+        assert_eq!(
+            res.messages[0].msg,
+            CosmosMsg::Bank(BankMsg::Send {
+                to_address: String::from(POOL_CONTRACT),
+                amount: vec![coin]
+            })
+        );
+    }
+    #[test]
+    fn valid_spend() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+        let data = spend_credential_data_fixture("blinded_serial_number");
+        let res = spend_credential(deps.as_mut(), env.clone(), info, data.clone()).unwrap();
+        if let CosmosMsg::Wasm(WasmMsg::Execute {
+            contract_addr,
+            msg,
+            funds,
+        }) = &res.messages[0].msg
+        {
+            assert_eq!(contract_addr, MULTISIG_CONTRACT);
+            assert!(funds.is_empty());
+            let multisig_msg: MultisigExecuteMsg = from_binary(msg).unwrap();
+            if let MultisigExecuteMsg::Propose {
+                title: _,
+                description,
+                msgs,
+                latest,
+            } = multisig_msg
+            {
+                assert_eq!(description, data.blinded_serial_number().to_string());
+                assert!(latest.is_none());
+                if let CosmosMsg::Wasm(WasmMsg::Execute {
+                    contract_addr,
+                    msg,
+                    funds,
+                }) = &msgs[0]
+                {
+                    assert_eq!(*contract_addr, env.contract.address.into_string());
+                    assert!(funds.is_empty());
+                    let release_funds_req: ExecuteMsg = from_binary(msg).unwrap();
+                    if let ExecuteMsg::ReleaseFunds { funds } = release_funds_req {
+                        assert_eq!(funds, *data.funds());
+                    } else {
+                        panic!("Could not extract release funds message from proposal");
+                    }
+                }
+            } else {
+                panic!("Could not extract proposal from binary blob");
+            }
+        } else {
+            panic!("Wasm execute message not found");
+        }
+    }
+
+    #[test]
+    fn invalid_spend_attempts() {
+        let mut deps = helpers::init_contract();
+        let env = mock_env();
+        let info = mock_info("requester", &[]);
+
+        let invalid_data = SpendCredentialData::new(
+            Coin::new(1, "invalid_denom".to_string()),
+            String::new(),
+            String::new(),
+        );
+        let ret = spend_credential(deps.as_mut(), env.clone(), info.clone(), invalid_data);
+        assert_eq!(
+            ret.unwrap_err(),
+            ContractError::WrongDenom {
+                mix_denom: crate::support::tests::fixtures::TEST_MIX_DENOM.to_string()
+            }
+        );
+
+        let invalid_data = SpendCredentialData::new(
+            Coin::new(1, crate::support::tests::fixtures::TEST_MIX_DENOM),
+            String::new(),
+            "Blinded Serial Number".to_string(),
+        );
+        let ret = spend_credential(deps.as_mut(), env.clone(), info.clone(), invalid_data);
+        assert_eq!(
+            ret.unwrap_err().to_string(),
+            "Generic error: Invalid input: address not normalized".to_string()
+        );
+
+        let invalid_data = spend_credential_data_fixture("blined_serial_number");
+        spend_credential(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            invalid_data.clone(),
+        )
+        .unwrap();
+        let ret = spend_credential(deps.as_mut(), env, info, invalid_data);
+        assert_eq!(
+            ret.unwrap_err(),
+            ContractError::DuplicateBlindedSerialNumber
+        );
+    }
+}
@@ -1,10 +1,7 @@
 [package]
 name = "nym-coconut-dkg"
 version = "0.1.0"
-edition = { workspace = true }
-authors = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
+edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@@ -21,15 +18,15 @@ nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts

 cosmwasm-schema = { workspace = true, optional = true }
 cosmwasm-std = { workspace = true }
-
+cosmwasm-storage = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw-controllers = { workspace = true }
 cw2 = { workspace = true }
 cw4 = { workspace = true }
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { workspace = true }

 [dev-dependencies]
-easy-addr = { path = "../../common/cosmwasm-smart-contracts/easy_addr" }
 cw-multi-test = { workspace = true }
 cw4-group = { path = "../multisig/cw4-group" }
 nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bogdan-Ștefan Neacşu	b83fdd34af	Add fd callback for initial authentication	2025-03-21 15:07:54 +02:00
Bogdan-Ștefan Neacşu	356cd2eeac	WIP	2025-03-21 13:53:37 +02:00